merge :(
progress
fight with codemirror :)
forms
build
fix for gh-pages
Merge branch 'master' into gh-pages
fix gh-pages