timer
Merge branch 'master' into timer

Conflicts:
	00. Project/src/Network/HostMessageHandler.java
1935
1939
2020
Merge remote-tracking branch 'git/timer'