added database back
Merge branch 'dev2' of https://github.com/meirianto/swatbarter into dev2