Changed db name to flux
Merge branch 'master' of https://github.com/mysmartcity/flux