fix for ice-server heartbeat without an access token
Merge branch 'master' of https://github.com/highfidelity/hifi
fix for custom hifi URL lookup
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 branch 'master' of https://github.com/highfidelity/hifi into fbx
Merge pull request #3883 from samcake/fbx

Adding a filter on the apartment model to get better lightmaps
Merge branch 'master' of https://github.com/highfidelity/hifi
have script loading be separate from ScriptEngine constructor
Merge pull request #3879 from birarda/master

fix for ice-server heartbeat without an access token, hifi:// URL
Merge pull request #3881 from ctrlaltdavid/find-vs2013-libovr

Find Oculus libraries when using Visual Studio 2013
Merge pull request #3882 from ctrlaltdavid/vs2013-build-instructions

Update build instructions for VS2013 Community and Professional
Merge pull request #3884 from huffman/entity-tools-polish

Entity tools polish
don't block main thread for a script load
fix an incorrect connection to script load error
Merge pull request #3885 from birarda/double-scripts

fix for ScriptEngine blocked load
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