[side-numbering] I *kinda* have lines

This is actually quite hard...
Merge remote-tracking branch 'origin/master' into side-numbering

Conflicts:
	app/assets/stylesheets/edit.css.scss
Got line numbering working...
Fix editor_helper to make it work with new gorilla_editor code
[GorillaEditor] Fix bug introduced by line numbers
Merge pull request #48 from GorillaApp/side-numbering

Left Side Numbering