Merging of Dave's code
Merge branch 'master' of https://github.com/maozilla/PotatoPosse

Conflicts:
	PotatoPosse/AndroidManifest.xml