Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/Main.java
	src/main/java/gui/GUI.form
	src/main/java/gui/GUI.java
	src/main/java/util/Configuration.java