activity started
show the filepath, does not upload yet
it shows the pictaaaaa
upload works (well, kindaaa)
Merge branch 'master' into activity

Conflicts:
	controllers/gallery-controller.js
	services/auth-service.js
Style options form boxes; include options controller