replace classic singleton with thread safe meyer singleton
Merge branch 'develop' of https://github.com/vrsys/guacamole into develop
locking material database update
Merge pull request #66 from scholli/develop

Develop