Merging Project edition into Project details
Merge branch 'test-merge' of github.com:atiberghien/makerscience into test-merge