Apparently I changed something a week ago.
Merge branch 'dev' of https://github.com/IJoshFTW/UFM-Reckoning into dev

Conflicts:
	src/main/java/nl/joshuaslik/UFMReckoning/gui/ActionController.java
	src/main/java/nl/joshuaslik/UFMReckoning/gui/NewGame.java
	src/main/java/nl/joshuaslik/UFMReckoning/gui/NewGame2.java
	src/main/resources/data/gui/pages-menu/NewGame.fxml