-
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/gtsoffenbach/tourdegts_adminapp/TagItemMagazine.java
working