asd
Merge branch 'master' of https://github.com/psperber/codecamp2

Conflicts:
	Challenger/bin/AndroidManifest.xml
	Challenger/bin/Challenger.apk
	Challenger/bin/classes.dex
	Challenger/bin/classes/de/uks/challenger/R$dimen.class
	Challenger/bin/classes/de/uks/challenger/R$drawable.class
	Challenger/bin/classes/de/uks/challenger/R$id.class
	Challenger/bin/classes/de/uks/challenger/R$layout.class
	Challenger/bin/classes/de/uks/challenger/R$menu.class
	Challenger/bin/classes/de/uks/challenger/R$string.class
	Challenger/bin/classes/de/uks/challenger/R$style.class
	Challenger/bin/classes/de/uks/challenger/model/Challenger.class
	Challenger/bin/classes/de/uks/challenger/model/Unit.class
	Challenger/bin/classes/de/uks/challenger/model/User.class
	Challenger/bin/resources.ap_
Merge branch 'master' of https://github.com/psperber/codecamp2.git
challenger service
Merge branch 'master' of https://github.com/psperber/codecamp2.git