Merge remote-tracking branch 'Liru/master'
Merge remote-tracking branch 'Liru/master'
added new floater_dae_export.xml translation file and other minor changes
Merge remote-tracking branch 'Liru/master'
Merge remote-tracking branch 'Liru/master'
update string.xml file for user status in panel avatar
Trees shadow parameters use actual debug settings

Use RenderDeferredTreeShadowOffset, RenderDeferredTreeShadowBias,
RenderDeferredSpotShadowOffset and RenderDeferredSpotShadowBias
in place of hard coded values.
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
Merge remote-tracking branch 'Liru/master'
update spanish language file floater_dae_export.xml
Merge branch 'master' of https://github.com/slabua/SingularityViewer
Satisfy Issue 1115: Make clock on top status line toggleable

Click the clock to change from server time to local~
Revert "Revert OCD commit tick."

This reverts commit 7346931f7f6f72abc089b9bd7e29250696124f87.
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer