setting
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gui/UIController.java
	src/logic/Consts.java