Refactor bookmark service
Merge branch 'master' of github.com:shijuvar/HapiAzure