working photo saving
changed image quality to 14
Merge branch 'master' of https://github.com/meamstack/meetmeapp
Merge branch 'master' of https://github.com/meamstack/meetmeapp
browser cors working
Merge branch 'master' of https://github.com/meamstack/meetmeapp

Conflicts:
	www/index.html
	www/js/controllers/map.js
fixed merge. don"t forget to grunt!
Merge pull request #61 from moog16/master

fixed merge