DAO Folder erstellt
Merge remote-tracking branch 'origin/master'

Conflicts:
	pictureserver/src/main/java/de/dhbw/pictureshow/database/dao/FolderDao.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
DAO Folder erstellt
DAO Folder erstellt
Bilder Service funktioniert