Merged conflict with Jocke
Merge branch 'master' of
https://github.com/AlienRunner/AndroidClient.git

Conflicts:
	src/com/spoton/alienrunner/MainActivity.java