Fixed focus mode issue
Minor changes
Merge branch 'master' of https://github.com/almalence/OpenCamera.git

Conflicts:
	AndroidManifest.xml