Fix indenting in AndroidManifest and fix build errors in main.xml
Merge branch 'master' of github.com:Purdue-ACM-SIGAPP/Purdue-App