Merge branch 'master' of https://github.com/lightblue-platform/lightblue-docs-user