delete user
color
mein scheiß
Merge branch 'master' of https://github.com/psperber/codecamp2.git

Conflicts:
	Challenger/src/de/uks/challenger/ui/MainActivity.java
	Challenger/src/de/uks/challenger/ui/history/HistoryFragment.java
	Challenger/src/de/uks/challenger/ui/setup/SetupFragment.java