#17, #18: Finished first controller classes stack and updated all
manifest xmls
Merge
Merge branch 'master' of https://github.com/Deepercreeper/Vampire.git

Conflicts:
	bin/AndroidManifest.xml