damian
Merge branch 'master' of https://github.com/simonecheccoli/idrolab-app-elite

Conflicts:
	Resources/lib/plugins/profilo/Profilo.js