OZF-183: Profile organizations
OZF-184: Moving lastLogin to Profile
OZF-171: Merging Profile logic and removing redundant classes
OZF-171: Removing Avatar
OZF-185: Fixing errors
Merge branch 'demo-master' into profile-cleanup

Conflicts:
	src/groovy/marketplace/rest/ServiceItemRestService.groovy
OZF-182: Adding Role to Profile
OZF-188: New-style REST for Profile

Fleshing out more REST patterns in addition to profile-specific changes
Merge branch 'demo-master' into profile-cleanup
OZF-188: Fixing HAL paging
OZF-188: Improving paging
OZF-188: Fixing isReadable
OZF-185: Org association security check
OZF-188: Fixing Jackson Date serialization
Merge branch 'profile-cleanup' into demo-master