Merged the project files

Still some errors in the AndroidManifest.xml we have do decide which
startup screen to use.