(Issue Hilary/284) Switch 'name' for content and groups to 'displayName'
Merge branch 'Hilary-issue-284' of git://github.com/mrvisser/OAE-model-loader into Hilary

Conflicts:
	api/content.dataload.js
Higher comment distribution