Scale back on first dropped packet, use Qt send/receive buffer size options
rather than setsockopt/getsockopt.
Moving the shaders used in Model.cpp from resources folder into the built-in executable
Adding the shader files
Merge branch 'master' of https://github.com/highfidelity/hifi
Fix overflow warning.
Update grid colors
Merge pull request #4017 from ey6es/master

Scale back on first dropped packet, use Qt socket options, fixed overflow warning.
Merge pull request #4019 from huffman/update-grid-colors

Update grid colors
Merge pull request #4018 from samcake/temp0

Moving the shaders used in Model.cpp from resources folder into the built-in executable
Merge branch 'master' of https://github.com/highfidelity/hifi into test_branch

Conflicts:
	interface/src/ModelUploader.cpp