Fixed links to T&C and privacy in user registration form (Fixes trentorise/dati.trentino.it#154)
Merged more templates from 2.2