EntityItem::setSimulationState() now public
add EntitySimulation and SimpleEntitySimulation
EntitySimulation takes EntityItem* rather than ID
EntityServer gets a simuation
EntityCollisionSystem moves to interface

and interface connects EntityCollision system to EntityTree
EntityTreeHeadlessViewer gets a simulation
merge upstream/master into andrew/thermonuclear
add entities to simulation after unpacking
Merge branch 'master' of https://github.com/highfidelity/hifi
moving EntityCollisionSystem back to entities lib
OctreeServer::createTree() is now protected
merge upstream/master into andrew/thermonuclear
Fix selection shadow not updating when grid moves
Hack for the Viking Palace scene before demo for good looking lightmaps
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
Fix constant movement with hydra by adding null zone for thrust
add same for rotation
...and don't turn on/off UI from hydra
Default 'Allow Select Large/Small Models' to true
Merge pull request #3887 from samcake/tot

Hack for the Viking Palace scene before demo for good looking lightmaps