...
Merge branch 'master' of https://github.com/AStA-Wedel/Kasse.git

Conflicts:
	src/main/java/org/fhw/asta/kasse/client/activity/PrintCustomsActivity.java