Conflicts: public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee public/coffee/ide/editor/directives/aceEditor/spell-check/SpellCheckManager.coffee