fix tests
Merge branch 'layout'
fix jslint
use patched ui-codemirror and remove it from bower
Merge branch 'layout'
fix tests
Merge branch 'master' into layout