Discovery, Management Dataset
Merge branch 'master' of https://github.com/csipiemonte/yucca-userportal

Conflicts:
	userportal/src/main/webapp/js/management/ManagementController.js