cleaned up entity updating
Merge branch 'unstable' into develop

Conflicts:
	js/ayai/display/Character.js
Commented out char removal for now. Fixed bugs with merge.