OZP-64: PersonalWidgetDefinitionModel contains a WidgetDefinitionModel
Merge branch 'master' into feature/ozp-64-preferences-api

Conflicts:
	modules/client/src/main/webapp/js/models/PersonalWidgetDefinition.js
OZP-64: Fixing build failures after merge
OZP-64: Fixing default scopeGuid in Preference
OZP-64: Add new default sync functionality

Making the return type a promise that has the same callback
parameters as 'success' and 'error' options on the sync call itself
OZP-64: Unit test for new sync return value
OZP-64: Making setPreference always cause a POST
Merge branch 'master' into feature/ozp-64-preferences-api
OZP-64: Fixing preferences REST URL
OZP-64: Fixing preference delete URL handling
OZP-64: Fixing preference 'me' URL handling
Merge branch 'master' into feature/ozp-64-preferences-api
Merge branch 'master' into feature/ozp-64-preferences-api

Conflicts:
	modules/client/src/main/webapp/js/models/Model.js
	modules/client/src/main/webapp/js/models/PersonalWidgetDefinition.js
	modules/client/src/test/js/models/ModelSpec.js
Merge branch 'master' into feature/ozp-64-preferences-api

Conflicts:
	modules/client/src/main/webapp/js/models/PersonalWidgetDefinition.js

Also modified ModelSpec test so that it uses a proper sinon stub
that actually gets cleaned up at the end
OZP-64: Removing orig file
OZP-64: Fixing delete group pref bug
OZP-64: Delete preference 404 if not found
Merge branch 'master' into feature/ozp-64-preferences-api
OZP-64: Making 'me' url handling more consistent
Merge branch 'master' into feature/ozp-64-preferences-api