fixed a bug in leverParser
Merge branch 'master' into b2branch
Ugly implementation of aiming and firing bullets, but it works.
Fixed rotation bug in ProjectileToken. Implemented rotation of weapon.
Enable level list

STarted fixing levels
Merge branch 'Gameplay'
Enable level lists in PreGameMenu (Not working atm)
Added turn timer
Merge branch 'Gameplay' of ssh://git@github.com/Daveiac/AndroidGameProject.git into Gameplay

Conflicts:
	game/src/no/ntnu/folk/game/constants/GameplayConstants.java
Fixed KeyPad layout, fixed swapKey which will start WeaponSelectLayer but dont work right now since the WeaponSelectLayer dont create image of weapons yet. Need weapon image from somewhere
like from playermodel.weaponmodel.weapontoken or something in that sort. Also need gravity to start implement jump with upKey.
Merge branch 'Gameplay' of https://github.com/Daveiac/AndroidGameProject into Gameplay
fixed the LevelController to read the levels
added a new level: flat.level
Merge branch 'Gameplay' of https://github.com/Daveiac/AndroidGameProject.git into Gameplay
GameModel - changed the currentLevel parameter to be an actual
LevelModel
LevelModel - added the method loadLevel() in the constructor
fixed bug with player still moving after his turn has finished
Merge branch 'Gameplay' of https://github.com/Daveiac/AndroidGameProject into Gameplay
tried to fix a bug, turns out it wasnt a bug it was a design decition that i didnt know
weapon image is added
added BULLET_SPEED as a constant
GameLayer - draw levelTokens
LevelController - fixed reading of files
LevelParser - still under construction (not working)
GameModel - currentLevel is now a LevelModel instead of a string
LevelModel - commented out the loadLevel method