Converted CoffeScript files
Merge conflicts