- fixed the code after last merge
- fixed saving and loading of folder settings
Merge branch 'BetterExplorer2.5' of https://github.com/DimitarCC/BetterExplorer into BetterExplorer2.5

Conflicts:
	Shell/ShellViewEx.cs