Merge branch 'feature/user-settings' into develop
Merge branch 'feature/refactoring' of github.com:srit/intrabytes into feature/refactoring
Refactoring