update
Merge branch 'master' of https://github.com/E-HealthTeam/ehealthPG_Android

Conflicts:
	js/models/Profilo.js
	js/router.js