Minor tweak to the Timer class; kind of pointless
Added an option to skip missing config files
Fixed controls & hotkeys interferring; smoother logouts
Merge branch 'develop' into high-water-mark

Conflicts:
	server/server_logic.cpp

Finally merging the changes to develop. This is only the ConfigUtility
skipping missing files, and something with the Timer class, that I'll need
to test the collisions.
Merge branch 'high-water-mark' into collisions