merge conflict
merge fix
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
added partial for update note form, ajax callback on create_note success to prepend the new note to the notelist
removed note_update_form partial from notes, find the most recent note in lecture controller, moved the note_update_form to lecture controller, partly working
show newly created note at the top of the note list, works