Branch: development_settings
Minor changes in settings and Add view history and view schedule related change
conflict resolved