vafan bärbar
fan fan
Merge branch 'master' of https://github.com/nikoooo/TheArena

Conflicts:
	bin/classes/arenanproj/arenan/LoginActivity$UserLoginTask.class
	bin/classes/arenanproj/arenan/LoginActivity.class