added webservice bridge
Merge branch 'engine' of github.com:baasbox/baasbox into engine
fixed regression on friendship
removed flaky test