login facebook pro
Merge origin/master

Conflicts:
	I coinquilini/i coinquilini-ejb/nbproject/project.properties
	I coinquilini/i coinquilini-war/nbproject/project.properties
	I coinquilini/nbproject/project.properties