README - Update to 'Server & Deployment' section*
Merge commit 'dc850a6173a9c34d88c2ae98cc51a4bf4c679fb0'

Conflicts:
	README.md
Merge commit 'dc850a6173a9c34d88c2ae98cc51a4bf4c679fb0'

Conflicts:
	README.md