better support for includes in entity scripts
work in making entity script mixable and inheritable
hacking on global functions
tweaks
Merge branch 'cuckoo'
set policy for shared lib creation on OS X
fix missing script dependency from shared
fix missing render-utils dependencies
fix GLUT library link in render-utils
add missing link to fbx from avatars
fix more missing dependencies in render-utils
add missing avatars link to entities
add missing metavoxels link to script-engine
link to render-utils from entities renderer
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi
rename cmake macro to represent actual purpose
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi
Merge branch 'master' of https://github.com/highfidelity/hifi into entityScriptsAndEvents

Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.h