Added camera feature
Merge branch 'master' of github.com:SindreNordbo/radiomotor-android

Conflicts:
	AndroidManifest.xml