fixed Android Manifest, updated other activities
Merge branch 'master' of gh:molecule-madness/mm