Added timers
Conflict fix
Commit fix
Merge branch 'client' of https://github.com/lucaspi/AndroidRally into client

Conflicts:
	AndroidRally/src/se/chalmers/dryleafsoftware/androidrally/libgdx/DeckView.java
	AndroidRally/src/se/chalmers/dryleafsoftware/androidrally/libgdx/GdxGame.java