aggiunto campi per google
Merge commit 'cf9474bfa2568359e5b7c87f0453b451eb11d00d'

Conflicts:
	Model/BaseUser.php