Merge remote-tracking branch 'origin/inventoryDrag'

Conflicts:
	objects.json
Merge branch 'master' of https://github.com/aatuh/kiigame

Conflicts:
	objects.json