dz
Merge remote-tracking branch 'origin/master'

Conflicts:
	my-gdx-game/bin/com/me/mygdxgame/Assets/Pictures.class