Per Olav Flaten
 - Major clean up of code in the camera package
Merge branch 'master' of https://github.com/persn/Lommeradaren.git

Conflicts:
	Lommeradaren/res/values/strings.xml