in progress trying to get camera working
Merge branch 'master' of https://github.com/lrbridge/SnapNoteV2

Conflicts:
	app/www/js/snapnote.js
	app/www/partials/create-note.html