working on Entity/Component models
Merge branch 'features_dev' of https://github.com/stevegocoding/pycbgocp into features_dev

Conflicts:
	gems_game/component.py
	gems_game/entity.py