smaller damage
replace deprecated qt5 macros in cmake with target_link_libraries
repair a typo in particles link to widgets lib
Fix was at the wrong spot
Merge branch 'master' of https://github.com/highfidelity/hifi into freeglut_fix
Merge pull request #2197 from Atlante45/freeglut_fix

Freeglut fix
adjustable height of bot avatars
fix failed lock causing particle collisions to not work
fix infinite reloading of missing script files
Merge pull request #2201 from ZappoMan/bugfixes

fix infinite reloading of missing script files
Merge pull request #2200 from ZappoMan/particle_collisions

fix failed lock causing particle collisions to not work
Merge pull request #2202 from birarda/authentication

remove deprecated qt5 methods in CMakeList files
Merge pull request #2199 from PhilipRosedale/master

Adjustable bot pelvis height
add time to the interface logs - closes #2205
fix failed create voxel with key press 0 at startup of editVoxels.js
Merge pull request #2207 from ZappoMan/bugfixes

fix failed create voxel with key press 0 at startup of editVoxels.js
Merge pull request #2206 from birarda/master

add time to interface log output