integrate entity/component model with cocos2d (continued)
Merge branch 'features_dev' of https://github.com/stevegocoding/pycbgocp into features_dev

Conflicts:
	shoot_game/entity.py
	shoot_game/graphics.py
	shoot_game/model.py