Merge branch 'camera' of github.com:henninghall/AinAppen

Conflicts:
	res/layout/fragment_add_case.xml
	res/layout/fragment_case.xml
	src/gov/polisen/ainappen/CaseFragment.java
	src/gov/polisen/ainappen/ContactsFragment.java
Merge branch 'master' of github.com:henninghall/AinAppen