Renamed contentId to id, added resourceType to all basic feeds, cleaned up user feed output
Added profilePath to all feeds + replaced downloadLink with downloadPath
Reset test timeouts
Merge branch 'master' into issue377

Conflicts:
	node_modules/oae-content/tests/test-content.js
Merge pull request #378 from nicolaasmatthijs/issue377

User, group and content API improvements
Merge branch 'master' of github.com:sakaiproject/Hilary