Merge remote-tracking branch 'origin/master'

Conflicts:
	GUI_01/src/migLayout/MyGUI.java