yo
Merge remote-tracking branch 'origin/live-demo' into camera

Conflicts:
	res/layout/activity_procedure.xml
Merge branch 'camera' of https://github.com/cmuellerrr/PEER.git into live-demo