update completaSocial
Merge origin/master

Conflicts:
	I coinquilini/i coinquilini-war/src/java/web/UserController.java