...
..
Merge branch 'fixing-shaders' of github.com:glob3mobile/g3m into fixing-shaders
...