to pull
Merge branch 'dev' of https://github.com/damouse/Glassroom-Server into ajax

Conflicts:
	log/development.log
delete image works now
added notes controller
render note in editor
notes_update: on hitting enter key, saving notes
create_note, update_note
create note on lecture viewer
added callback on new note creation success: clear fields
note/delete added
added delete confirm dialogue to image
fixed type in img view
moved create note form outside ul
added more notes
Merge pull request #30 from damouse/ajax

Ajax