Hope this doesn't break what i already commited
Merge branch 'master' of https://github.com/asauron/phototaker2

Conflicts:
	res/layout/activity_main.xml
	res/layout/activity_observation.xml