modules manager
Merge branch 'featuremodulemanager' into develop