Ported restricted resources to use nginx
Merge branch 'master' into cperello/restricted-resource-fixes

Conflicts:
	main/core/ChangeLog
Merge pull request #1013 from Zentyal/cperello/restricted-resource-fixes

Ported restricted resources to use nginx