Cleanup tests
Cleanup BaseController
Update SettingService
Cleanup
Merge branch 'master' of github.com:subbly/cms