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
fix for ice-server heartbeat without an access token
Merge branch 'master' of https://github.com/highfidelity/hifi
fix for custom hifi URL lookup
oculus mirror lean hack
Find Oculus libraries when using Visual Studio 2013
Update build instructions for VS2013 Community and Professional
Adding a Hack for the apaartment model to boost the lightmaps
Merge pull request #3880 from ZappoMan/bugFixes

oculus mirror lean hack
Add option for white grid color
Darken colors of selection/highlight boxes
Update the tool window to use tabbed windows
Add rotation degrees overlay