Disregard BB, Acquire MM
Merge branch 'master' of https://github.com/Pancia/hackathon

Conflicts:
	src/main/AndroidManifest.xml