Update docs
Merge branch 'master' of https://github.com/Soletic/oxygen-docs

Conflicts:
	cookbook/deployment/deployment-application.rst