Debug
Merge branch 'master' of github.com:Bagception/BagceptionClient

Conflicts:
	src/de/uniulm/bagception/client/ui/launcher/OverviewFragment.java
	src/de/uniulm/bagception/client/ui/launcher/OverviewTabFragment.java