added test.level
Merge branch 'master' into b2branch
changed folder of test.level to test/raw
Merge branch 'master' into b2branch

Conflicts:
	game/res/levels/test.level
Added a GameModel class

GameModel class to keep track of the gameState during gameplay
GameModel update
Merge remote-tracking branch 'origin/Gameplay'
Merge branch 'master' of https://github.com/Daveiac/AndroidGameProject
added .project to gitignore
Merge remote-tracking branch 'origin/Menus'
Fixed buttoms
tok away errors
Merge branch 'Gameplay' of https://github.com/Daveiac/AndroidGameProject into Gameplay
Now im sure buttoms works
Merge branch 'Gameplay'
Made some changes to LevelElement

THe Level parser will make LevelTokens, and send a list of this to the
GameState to be drawed to the layer
Merge branch 'master' of https://github.com/Daveiac/AndroidGameProject
Merge branch 'master' into b2branch
Merge branch 'master' into b2branch
Tok away some sysouts