Merge remote-tracking branch 'origin/master'

Conflicts:
	MyFlaxa/src/com/mydalsa/myflaxa/states/GameState.java