HU05
Merge
Merge
Merge origin/master

Conflicts:
	revalora-web/src/main/webapp/roles/experto/climateStudy/index.xhtml