Various small fixes.
Merge branch 'dev' of github.com:Gazok/Tank into dev

Conflicts:
	Tank/Utility/Timer.cpp
	Tank/Utility/Timer.hpp