Merge origin/master

Conflicts:
	src/main/java/View/FrontManager.java