Merge branch 'tot' of https://github.com/samcake/hifi into temp0
Remove Application dependency
Add entity model upload
remove current address from address bar dialog
Broke down ModelUploader::zip()
ModelUploader only has static methods accessible
Set texture limit back to 1024
Add the autoScribeShader cmake
fix typo
first version of SCribe used for shaders in render-utils
Merge branch 'temp0' of https://github.com/samcake/hifi into temp0
Merge pull request #4003 from birarda/master

remove the current address from the address bar
Merge pull request #4004 from Atlante45/modeluploader_scripting_interface

Entity upload
fix the c++ header generation for mac though the brand new raw string format of c++11
polishing the scribe -c++ case
replace the model.frag and model.vert files from resource by the sl version of the shaders
Merge branch 'master' of https://github.com/highfidelity/hifi into temp0
removing shaders from resource
clean cmake file for autoScribeShader
Merging with origin temp0