Added CORS filter to enable development with dev backend
Merge branch 'master' of github.com:ozone-development/ozp-controller-jvm

Conflicts:
	src/main/web/app/scripts/services/dashboard.js