added hitpoints and faction
Merge branch 'master' of github.com:themitch/remcovsmitchel

Conflicts:
	remcovsmitchel/src/com/prutsers/remcovsmitchel/managers/GameManager.java
	remcovsmitchel/src/com/prutsers/remcovsmitchel/screens/GameScreen.java