Removed unused code
Merge branch 'master' of https://forge.powerfolder.com/git/PF-CORE

Conflicts:
	src/main/de/dal33t/powerfolder/disk/FolderSettings.java