Item collision with car
Merge branch 'master' of https://github.com/jdoda/uncooperative

Conflicts:
	uncooperative/engine/component.py
	uncooperative/engine/game.py
Merge branch 'master' of https://github.com/jdoda/uncooperative
Collision between car and player is broken when carrying items
Merge branch 'master' of https://github.com/jdoda/uncooperative

Conflicts:
	uncooperative/res/definitions/character-base.json