refactoring totale
refactoring totale 1.1
Merge origin/master

Conflicts:
	web/scripts/user.js
	web/style/style.css
	web/view/user.jsp