foo
foo
Merge branch 'master' of https://github.com/mkirchmann/pdvfm.git

Conflicts:
	src/main/java/com/prodyna/esd/filemanager/MyFileSystemManager.java