configurations and Module added
Module configurations and add new Module.
Merge branch 'module'