Change Preferences Popup UI to use a JTabbedPane
Merge branch 'master' of https://github.com/freeplane/freeplane
Merge branch 'master' of https://github.com/theworldbright/freeplane

Conflicts:
	freeplane/src/org/freeplane/core/resources/components/OptionPanel.java