Revert "Runway"

This reverts commit f047a3e499ad0ade4cad464820d75f7b49035705.
Merge branch 'master' of https://github.com/marco61/IM-Android

Conflicts:
	bin/AndroidManifest.xml