Conflicts: app/views/project/editor/editor.jade public/coffee/ide.coffee public/coffee/ide/editor/directives/aceEditor.coffee