Start på grid

Endring i hvordan levels lages, bruke nå grid position i raw filene.
Endring i at alle tokens lages med en grid position og grid
height/width.
Walls tegnes med hjelp av en GridSize constant i ProgramConstants.

Levelmodel lager en gameGrid med verdier 0 og 1, hvis 0 er d ikke no i
den griden å kollidere med, hvis 1 er det noe der. Vil bruke dette til å
finne kollisjoner. FOrtsatt mye å endre før d fungerer da.
Added LevelEditor. Reachable from DevMenu, but is not implemented yet.
Changed level loading to grid.

Only level test0.level working
removed old levels
Merge branch 'TheGridBranch' of ssh://github.com/Daveiac/AndroidGameProject into TheGridBranch
Merge branch 'Gameplay' into TheGridBranch

Conflicts:
	game/res/raw/flat.level
	game/res/raw/test.level
	game/src/no/ntnu/folk/game/gameplay/levels/controllers/LevelParser.java
	game/src/no/ntnu/folk/game/gameplay/levels/views/TokenFactory.java
	game/src/no/ntnu/folk/game/gameplay/levels/views/Wall.java
	game/src/no/ntnu/folk/game/gameplay/models/GameModel.java
	game/src/no/ntnu/folk/game/gameplay/models/LevelModel.java
Change in levelmodel to take an number as argument insted of the level
id.
Camera centers on current player
Fixed aim
Fixed player start positions
changed turn time to 1 min
Added sixth start position in test0.level
Merge branch 'TheGridBranch' of github.com:Daveiac/AndroidGameProject into TheGridBranch
Removed unused code
Can no longer swap weapon without pressing the swapKey first
Made model work more like a model, less like a controller
Added a new empty map
Merge branch 'TheGridBranch' of ssh://git@github.com/Daveiac/AndroidGameProject.git into TheGridBranch