maj rapport8 + mini_maj DCD
Merge branch 'dev' of https://github.com/kaldoran/gl into dev