OZF-112: Initial Folders work
OZF-112: Switching from folder to ApplicationLibraryEntry
OZF-112: folder startup fixes
Merge remote-tracking branch 'demo/master' into ozf-112-folders

Conflicts:
	grails-app/resources/marketplace/rest/ProfileResource.groovy
OZF-112: ApplicationLibrary serialization fixes
OZF-112: Switching to HAL format for ApplicationLibrary list
Revert "OZF-112: Switching to HAL format for ApplicationLibrary list"

This reverts commit 81aac6be520e17846f0a64987e004c5ecd35e0a9.
OZF-112: Adding ability to re-order library
OZF-112: Changing rest endpoint name
Merge branch 'ozf-112-folders' into demo-master