amicizia indiretta
bozza della pagina di visualizzazione
conflitti
Merge branch 'master' of
https://tomma156@code.google.com/p/swimv2-paladino-pogliani-tommasini/

Conflicts:
	swimv2-web/src/main/webapp/WEB-INF/personalarea.jsp
	swimv2-web/src/main/webapp/WEB-INF/userprofile.jsp
Merge branch 'master' of https://tomma156@code.google.com/p/swimv2-paladino-pogliani-tommasini/
bugfix
Edit profile, plus fixed bugs in profile images
Merge branch 'master' of https://code.google.com/p/swimv2-paladino-pogliani-tommasini