Merge remote-tracking branch 'origin/Remi' into Vanessa

Conflicts:
	SocialMediaPinnwand/src/hdm/social/media/pinnwand/client/PinnwandAdministration.java
	SocialMediaPinnwand/src/hdm/social/media/pinnwand/client/PinnwandAdministrationAsync.java
	SocialMediaPinnwand/src/hdm/social/media/pinnwand/client/SocialMediaPinnwand.java
	SocialMediaPinnwand/src/hdm/social/media/pinnwand/server/PinnwandAdministrationImpl.java
es läuuuuft
Abonnements
Merge branch 'Vanessa' of
https://github.com/rt012/SocialMediaPinnwand.git into Vanessa

Conflicts:
	SocialMediaPinnwand/src/hdm/social/media/pinnwand/client/SocialMediaPinnwand.java
	SocialMediaPinnwand/src/hdm/social/media/pinnwand/server/PinnwandAdministrationImpl.java
Merge remote-tracking branch 'origin/Vanessa' into Ferdi