Added turn timer
Merge branch 'Gameplay' of ssh://git@github.com/Daveiac/AndroidGameProject.git into Gameplay

Conflicts:
	game/src/no/ntnu/folk/game/constants/GameplayConstants.java