OZP-65: Preferences URL computation
OZP-65: PreferenceModel unit tests
OZP-64: PreferenceModel checking required attrs
OZP-64: PersonModel.getCurrentPerson
Merge branch 'master' into feature/ozp-64-preferences-api

Conflicts:
	modules/client/src/main/webapp/js/collections/PreferencesCollection.js
	modules/client/src/main/webapp/js/models/PersonModel.js
	modules/client/src/main/webapp/js/models/PreferenceModel.js
	modules/client/src/test/js/models/PreferenceModelSpec.js
OZP-64: Rewriting URL handling in PreferenceModel
Merge branch 'master' into feature/ozp-64-preferences-api
OZP-64: Adding missing jquery require
OZP-64: Removing uneeded originalName property from WidgetDefinition
OZP-64: Removing unecessary guid field (using id instead)
OZP-494
fixing travis badge to only show status for master in readme
Merge branch 'master' of https://github.com/ozoneplatform/ozp-commons
OZP-17: add background widgets to Dashboard
OZP-72 - Write Eventing API unit tests.
updated travis config to build any branch that changes to help notify of build issues before merging feature branches
OZP-296: Make sure all testacular tests produce code coverage

Configure coverage reporter
OZP-296: Make sure all testacular tests produce code coverage

update archetype testacular conf file
OZP-296: Make sure all testacular tests produce code coverage

update archetype
Merge branch 'master' into feature/ozp-64-preferences-api
OZP-296: Make sure all testacular tests produce code coverage

- set window.onerror to empty function to fix so that mocha doesn't
fail tests
Merge branch 'feature/ozp-64-preferences-api'

Merge of changes in Preferences branch so far