re-add submodules
fix pages
fix pages
Merge branch 'dev' into crem2