Revert "testgame_4"

This reverts commit 9ab1e638722996272f50d077ea2067d4f65c001d.
test_game

test_game
Merge branch 'master' of https://github.com/cassidoo/Balance

Conflicts:
	app/src/main/bin/AndroidManifest.xml
	app/src/main/project.properties