commit local changes before merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	GUI-Swing.iml
GUI-Swing 3.3.12 - JavaFX-based browser will open in new windows when appropriate