maj CTR
Merge branch 'dev' of https://github.com/kaldoran/gl into dev