Various enhancements
Merge origin/master

Conflicts:
	app/modules/notes/js/controllers/note-edit-controller.js