Initial nginx service
Add provides = web-server to apache-httpd and nginx services
Merge remote-tracking branch 'origin/develop' into feature/nginx-stack
CHANGELOG update
Merge remote-tracking branch 'origin/develop' into feature/nginx-stack

Conflicts:
	CHANGELOG.md
Merge pull request #323 from continuuity/feature/nginx-stack

Feature/nginx service