....
Merge branch 'master' of https://github.com/DeinMuell/DeinMuell

Conflicts:
	Android/gen/de/jugendhackt/deinmuell/R.java