Merge remote-tracking branch 'origin/master'

Conflicts:
	GameDemo/src/com/angrynerds/gameobjects/Player.java