Charts tentativa frustrada
Merge origin/master

Conflicts:
	web/assets/admin/pages/scripts/home.js
	web/home.xhtml