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
At least on Linux, fixes an annoying issue where closing the application
window causes it to disappear and reappear briefly before exiting.
Merge pull request #3886 from ey6es/master

At least on Linux, fixes an annoying issue where closing the application
Hack for the Viking Palace scene before demo for good looking lightmaps
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
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
Merge pull request #3888 from PhilipRosedale/master

Bug Fix: Hydra controllers sometimes moving constantly with hydraMove.js