Risistemata Logica front end
Merge branch 'master' of https://github.com/multit/autovalutazione into HEAD

Conflicts:
	app/scripts/controllers/main.js
Correzione del merge
test
test2