Added settings manager, add ability to save settings from controller plugin
Merge branch 'develop'