init_codemirror
Merge remote-tracking branch 'origin/master'

Conflicts:
	editor/code.html
With Info Slider.
Merge branch 'master' of https://github.com/anujnm/abstracted-spiders

Conflicts:
	editor/code.html
Parse Integration