Merge branch 'master' into feature/Commands

Conflicts:
	src/main/java/net/nokok/twitduke/controller/MainViewController.java
	src/main/java/net/nokok/twitduke/main/Main.java