nichts neues
Merge remote-tracking branch 'origin/Florian' into Florian

Conflicts:
	SocialMediaPinnwand/src/hdm/social/media/pinnwand/server/db/DBConnection.java