Avoid compile error when using glh and boost at the same time.

Defining a macro in a header that doesn't have any namespace prefix
like GLH_ ugh. Very bad.

Changed the macro into an inline function inside namespace glh.
fix typo and update text for new option in avatar menu
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
Collada export, now with more awesome

* Added support for exporting textures
* Added support for applying texture parameters
* Added support for merging faces with same textures
* Added support for skipping transparent faces
Made texture export on by default when exporting Collada.
Typo fix
Don't pass std::string to llformat
Appease VS2010 warning and make ui code more consistent with the modern standard in daeexport.cpp
Fix log timestamp inconsistency when including seconds
Don't crash when chanelp returned is null
Kill a compiler warning
Request: Add menu item separator between replace and remove.
Fix log being read from the top, woops
Merge branch 'master' of git://github.com/lkalif/SingularityViewer
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer