intermediate
Fixed the peter,pansen bug and removed the intent filters for the app.
Conflicts:
	AndroidManifest.xml
various other changes.