added table user_has_barnbay and adapted the services
solved merge conflict
Merge branch 'frontend' of https://github.com/BarnBay/master into frontend