modified deployment
fixed bad DB reference
Merge branch 'master' into rewrite

* master:
  fixed bad DB reference
  modified deployment