Added system settings module.
Merge branch 'system-settings' into develop