Fix Settings
Merge branch 'new_api' of github.com:WFP-Dubai/Tracker into new_api