Merge origin/master

Conflicts:
	StudiSocial-war/web/profile.jsp
Merge origin/master

Conflicts:
	StudiSocial-war/web/profile.jsp
Merge origin/master

Conflicts:
	StudiSocial-war/web/profile.jsp
Merge origin/master

Conflicts:
	StudiSocial-war/web/profile.jsp
Merge origin/master

Conflicts:
	StudiSocial-ejb/src/java/ex/RiempiDB.java
	StudiSocial-war/src/java/web/Login.java