Adding in the ToolbarModel file.
CR-127: First round of changes resulting from model code review.
CR-127: First round of changes resulting from model code review.
CR-127: renaming models and collections to remove 'model' and 'collection' from their names since they name is redundant with their directory structure.
CR-127: renaming widget states collection.
Merge branch 'master' of https://github.com/ozoneplatform/ozp-commons into cr127
OZP-16 Removed position attribute from DashboardTemplate
Added a couple base classes and wanted to commit them.
Merge branch 'master' of https://github.com/ozoneplatform/ozp-commons into cr127
OZP-490 Copy widget definition display name
Merge branch 'master' of https://github.com/ozoneplatform/ozp-commons into cr127
OZP-119 - Set up functional testing
fixing codenarc to use the codenarc ant plugin, this fixes the codenarc/jenkins issue
ozp-119 kick off travis
Merge branch 'master' into feature/ozp-16-dashboard-switcher-services
Merge branch 'master' of https://github.com/ozoneplatform/ozp-commons into cr127
Merge branch 'master' of https://github.com/ozoneplatform/ozp-commons into cr127
Removed an unused model.
Merge remote-tracking branch 'remotes/origin/feature/ozp-14-toolbar-migration'
OZP-249: Ensuring ability to change properties for installation after build
Merge branch 'feature/ozp-73-persistence-api'

Conflicts:
	bundles/server/domain/src/main/groovy/org/ozoneplatform/commons/server/domain/model/Dashboard.groovy
	bundles/server/domain/src/main/groovy/org/ozoneplatform/commons/server/domain/model/DashboardInstance.groovy
	bundles/server/domain/src/main/groovy/org/ozoneplatform/commons/server/domain/model/DashboardTemplate.groovy
	bundles/server/domain/src/main/groovy/org/ozoneplatform/commons/server/domain/model/Person.groovy