temporary commit to get entity code up
Merge branch 'nonsupported' of https://github.com/msecret/aronnax into nonsupported

Conflicts:
	src/base.js