e6fd8ff Merge conflict

Merged and Committed by dchen 9 years ago
    Merge conflict
    
        
file modified
+1 -0
file modified
+38 -34
file modified
+1 -1