Bugfix: prevent flickering when changing general settings
Merge branch 'master' of https://github.com/arx-deidentifier/arx.git

Conflicts:
	src/gui/org/deidentifier/arx/gui/view/impl/define/ViewGeneralSettings.java