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