Merge origin/master

Conflicts:
	StudiSocial-war/src/java/web/Home.java