better support for includes in entity scripts
work in making entity script mixable and inheritable
hacking on global functions
tweaks
Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents

Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h
revert some prototype script stuff for now
revert some prototype script stuff for now
added leaveAllEntities support
Merge pull request #3990 from ZappoMan/entityScriptsAndEvents

Entity Scripts bug fixes/improvements