test commit
added timer shutdown
changed stop() to pause()
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/cegeka/nocturne/godgame/time/Timer.java
refactored timer
Merge remote-tracking branch 'origin/master'