Merge settings tabs- controller changes

#56
Merge settings tabs- view changes

#56
Remove inappropriate "static" from GeneralSettingsService methods

#56
Merge pull request #66 from metridoc/pull_combine_settings_tabs

Pull combine settings tabs