Album anlegen beim Bilderupload
Merge remote-tracking branch 'origin/master'

Conflicts:
	pictureserver/src/main/java/de/dhbw/pictureshow/servlet/FileUploadServlet.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Bilder anzeigen