Merge branch 'master' of https://github.com/rajdeepd/docs

Conflicts:
	source/docs/running/deploying-cf/components/index.html.md
Merge branch 'master' of https://github.com/rajdeepd/docs

Conflicts:
	source/docs/running/deploying-cf/components/index.html.md