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
Merge origin/master
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
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
merge fb g+ ok
Merge branch 'master' of https://github.com/Borcellippa/i-coinquilini-java

Conflicts:
	I coinquilini/i coinquilini-ejb/nbproject/project.properties
	I coinquilini/i coinquilini-war/nbproject/project.properties
	I coinquilini/i coinquilini-war/src/java/web/UserController.java
	I coinquilini/i coinquilini-war/web/completaSocial.jsp
	I coinquilini/i coinquilini-war/web/css/global.css
	I coinquilini/i coinquilini-war/web/header.jsp
	I coinquilini/nbproject/project.properties