Removed user model as it is replaced by settingsModel. Added db column for image uri.
Merged changes