Merge remote-tracking branch 'origin/master'

Conflicts:
	test_game/models/config.json