adding default local settings
Merge branch 'master' of github.com:mercycorps/FRDS
update inisital data and clean up model changes
update
fix conflict
remove extra folder
removing extra folder
remove venv
Merge branch 'dev'
Merge branch 'dev'
remove extra folder
update feed to use viewsets