Merge origin/master

Conflicts:
	src/uiComponent/StarterGUI.form
	src/uiComponent/StarterGUI.java