qr popup, starting image upload, etc
Merge branch 'master' of github.com:askuck/ahimsa-app