no message
Merge branch 'master' of https://github.com/oteichmann/VirtualFileManager

Conflicts:
	source/VirtualFileManager/src/com/prodyna/esd/filemanager/manager/MemoryFileManager.java