Intermediate
Merge remote-tracking branch 'origin/master' into 15
Merge branch '15' of https://github.com/fathersson/muCommander into 15

Conflicts:
	manager/src/main/java/com/mucommander/ui/viewer/text/TextEditorImpl.java
	manager/src/main/java/com/mucommander/ui/viewer/text/TextViewer.java
Merge branch master into 15