tidying up
Merge branch 'master' of https://github.com/NeatIf/neatif-app
update db settings