Sync back to gameplay
player sprite can move now i think
...
Revert "player sprite can move now i think"

This reverts commit 07224e4176fc296c4f40dc79933c70362116c84c.
Completely reworked the package structure for the project.
Merge branch 'Gameplay'

Conflicts:
	game/res/raw/test.level
	game/src/no/ntnu/folk/game/gameplay/models/GameModel.java
	game/src/no/ntnu/folk/game/models/LevelModel.java
	game/src/no/ntnu/folk/game/states/GameState.java
	game/src/no/ntnu/folk/game/states/menus/PreGameMenu.java
	game/src/no/ntnu/folk/game/views/level/Structure.java
Tried to clean up master a bit...
Merge branch 'master' into b2branch

Conflicts:
	game/src/no/ntnu/folk/game/gameplay/levels/controllers/LevelController.java
	game/src/no/ntnu/folk/game/gameplay/levels/levelParser.java
	game/src/no/ntnu/folk/game/gameplay/models/LevelModel.java