Source Directory
Merge branch 'master' of https://github.com/Ib01/MediaBeaver.git

Conflicts:
	MediaBeaverServer/src/main/webapp/SourceDirectory.jsp
	MediaBeaverServer/src/main/webapp/WEB-INF/tags/Folder.tag