OZP-75: Removed the domain bundle from REST services. The persistence feature will provide the domain bundle. This is necessary because the domain bundle that JPA uses has been byte code enhanced to work with OpenJPA
Merge branch 'master' into feature/ozp-73-persistence-api
OZP-73: Fix infinite recursion
Merge branch 'master' into feature/ozp-73-persistence-api
Merge branch 'feature/ozp-73-persistence-api'
OZP-13: Update database with sample data
Factoring out common functional test code
Merge branch 'master' of https://github.com/ozoneplatform/ozp-owf

Conflicts:
	bundles/client/container/wab/src/main/webapp/WEB-INF/views/jsconfig/serverConfig.jsp
OZP-13: Get widgets from Database instead of directly in jsp
OZP-193: Migrate iframe shims to protecting floating content from various plugins.
Merge branch 'master' into functionalTestBase

Conflicts:
	bundles/client/container/wab/src/main/webapp/WEB-INF/views/jsconfig/serverConfig.jsp
Merge branch 'master' into functionalTestBase

Conflicts:
	tests/functional/src/test/groovy/DashboardSwitcherSpec.groovy
OZP-715: enable tooltips and popovers
Merge branch 'master' of https://github.com/ozoneplatform/ozp-owf

Conflicts:
	bundles/client/container/wab/src/main/java/org/ozoneplatform/owf/bundles/client/container/controllers/jsconfig/ServerConfigController.java
	bundles/client/container/wab/src/main/webapp/WEB-INF/jsconfigControllers-servlet.xml
OZP-153 Spock-based integration tests for REST layer
Reactivating preferences functional tests
OZP-193: configure bgiframe as AMD module
OZP-13: Master merge
Merge branch 'master' of https://github.com/ozoneplatform/ozp-owf
OZP-13: Fix unit test.