Edit grunt/*.coffee
Update gems
Merge branch 'feature/20140227-refactoring' into develop