Merge origin/master

Conflicts:
	src/main/java/manager/MainMenu.java
Merge origin/master