Merge pull request #342 from uncled1023/Development

Bug Fixes
Merge branch 'Development'
Merge branch 'Development'
Bug Fixes and Major Changes
Merge branch 'Development'
Fixed default module config
Fixed Icons and Configs