0.0
Merge branch 'master' of https://github.com/andtoma/progettoBeContent

Conflicts:
	skins/sb-admin/html/registration_form.html
	skins/sb-admin/js/registration_form.js