Changed double tap allowed deltatime
Merge branch 'client' of https://github.com/lucaspi/AndroidRally into client
Clean up, javadoc and a place card by coordinates
Added drag and drop on cards
Merge fixed
partly fixed arrayIndexOutOfBoundsException, gameModel.HandleCollision
Merge branch 'development' into model0.2.1
Corrected merge mistakes
Merge branch 'model0.2.1' of https://github.com/lucaspi/AndroidRally into model0.2.1
conveyorBelts working correctly
small bug fix, gameModel.checkConveyorBelts
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
gameModel.checkConveyorBelt should be working
Added test for one robot pushing another one
Merge branch 'model0.2.1' of https://github.com/lucaspi/AndroidRally into model0.2.1
Timer fix
Corrected some faults