Merge origin/master

Conflicts:
	null.save
	src/main.java
	src/view/MainScreen.java