fix init
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
add sprite property to GameObjects
Merge remote-tracking branch 'origin/master'

Conflicts:
	GameObject.py
Merge remote-tracking branch 'origin/master'
fix GameObject