Merge origin/master

Conflicts:
	src/GUI/HLAfterAction1.java
	src/GUI/MainView.java