Production build 0.0.7
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml