some refactoring on UserSettingsService class
Merge remote-tracking branch 'origin/master'
Added front-end functionality for changing theme