Merge origin/master

Conflicts:
	src/presentation/HSUGUI.java