Now sets grid correctly in level model.
Entity now uses offset.
Upped the player speed to 100 for testing
started working with collisions. Currently just a sysout when the player
hits something.
Javadoc (and some refactoring).
Merge branch 'Gameplay' of github.com:Daveiac/AndroidGameProject into Gameplay
Extracted methods for each collision direction. All directions are now checked before returning.
Added option to set turn timer in menus
ups, fixed break;
new healthbar which i spelled wrong ofc -.-
Merge branch 'Gameplay' of https://github.com/Daveiac/AndroidGameProject into Gameplay

Conflicts:
	game/src/no/ntnu/folk/game/gameplay/entities/views/PlayerToken.java
Small tweak in settings
Created enum Direction to aid with collision detection.
Merge branch 'Gameplay' of ssh://git@github.com/Daveiac/AndroidGameProject.git into Gameplay
GameState - fixed projectiles to have a fixed muzzle velociy
Projectiles - now have a velocity parameter!
Merge branch 'Gameplay' of https://github.com/Daveiac/AndroidGameProject.git into Gameplay
TURTLEGUN! :D
KeyPadFix
fjerne en space
Merge branch 'Gameplay'

Conflicts:
	game/src/no/ntnu/folk/game/gameplay/entities/data/Projectiles.java
	game/src/no/ntnu/folk/game/gameplay/entities/data/Weapons.java
	game/src/no/ntnu/folk/game/gameplay/entities/views/PlayerToken.java
	game/src/no/ntnu/folk/game/gameplay/layers/GameLayer.java
	game/src/no/ntnu/folk/game/menus/menuStates/PreGameMenu.java