Continuing Comments
Merging Liev's changes to note_controller
Merge branch 'development' of https://github.com/mailcrunch/deployment into development
Working on spinner
Merged from development

Merge branch 'development' of https://github.com/mailcrunch/deployment into development
Added spinner page
Merge branch 'development' of https://github.com/mailcrunch/deployment into development

Conflicts:
	client/note/note.js
	server/note/note_controllers.js