Merge origin/master

Conflicts:
	src/GUI/HLAfterAction1.java
	src/GUI/MainView.java
Merge origin/master
Merge origin/master

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