UserSettings logic update
TaskList logic update
Merge branch 'TableViewDataSourceLogic' into develop