Merge branch 'edit' of github.com:samni698/AinAppen into edit

Conflicts:
	res/layout/fragment_edit_case.xml
	res/values/strings.xml
	src/gov/polisen/ainappen/EditCaseFragment.java
Merge branch 'edit' of github.com:samni698/AinAppen into edit

Conflicts:
	src/gov/polisen/ainappen/EditCaseFragment.java