Merge origin/master

Conflicts:
	StudiSocial-war/nbproject/build-impl.xml
	StudiSocial-war/nbproject/genfiles.properties
	StudiSocial-war/nbproject/project.properties
	StudiSocial-war/nbproject/project.xml
Merge origin/master