Place all config in config/module.config.php
Fixed typo
Merge branch 'develop'