layouts
asödlfaösldkjfösaldkfj
Merge branch 'master' of https://github.com/psperber/codecamp2

Conflicts:
	Challenger/src/de/uks/challenger/model/User.java
	Challenger/src/de/uks/challenger/ui/history/HistoryFragment.java