Merge branch 'master' of https://github.com/lmrv/cloudstack-docs-admin