removed angular-ui-codemirror (has some issues), adjusted markup
merge