OWF-17: allow user to update pane type via dragging
Merge branch 'master' into feature/ozp-150-create-dashboard
OZP-16: adding a wrapper model/collection around stacks and dashboards.
OZP-17: refactor, convert layoutConfig to designer format when designing and to dashboard when saving
Merge branch 'master' into feature/ozp-150-create-dashboard
OZP-16: Stubbing out some event handlers, cleaning out some test code.
Merge branch 'master' of https://github.com/ozoneplatform/ozp-owf into feature/ozp-16-migrate-dashboard-switcher
OZP-17: fix reset and css

- reset shouldn't remove widgets
- do not nest when dropping outside panes
OZP-150: progress on create and edit dashboard window
OZP-16: Hooking up a few events and changing the templates.
OZP-150: use prop instead of attr
Merge branch 'master' of https://github.com/ozoneplatform/ozp-owf into feature/ozp-16-migrate-dashboard-switcher
OZP-16: update window size work..
OZP-16: center bootstrap modal window, and fix updateWindowSize method
OZP-16: progress on switcher
OZP-17: progress on showing stack dashboards
OZP-16: dashboard switcher refactor/cleanup
OZP-150: file upload for creating from json file
Merge branch 'master' into feature/ozp-150-create-dashboard
OZP-64 REST endpoints and services for Preference

Conflicts:
	bundles/server/rest/src/main/groovy/org/ozoneplatform/owf/server/rest/ConfigController.groovy
	bundles/server/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml