db_setup fix
Merge branch 'master' of https://github.com/gsigler2/paragon-messenger