remove all occurences of xivoserver
Merge branch 'refactor_db' into review_db

* refactor_db:
  remove all occurences of xivoserver