2c36f82 Fix merge conflicts and update to 2.1.0

Authored and Committed by skytux 12 years ago
    Fix merge conflicts and update to 2.1.0
    
        
file removed
-3
file modified
+1 -27