updated all views but "create-note.html"
Merge branch 'master' of https://github.com/lrbridge/SnapNoteV2

Conflicts:
	app/www/partials/choose-image.html