Merge eventually.
Fixing this god-damn mess.
Merge branch 'master' of https://github.com/trebegin/AppTest

Conflicts:
	FirstProject/AndroidManifest.xml
	FirstProject/bin/AndroidManifest.xml
	FirstProject/src/com/example/firstproject/MainActivity.java