Merge branch 'master' of https://github.com/stefanoantonel/Chieti.git

Conflicts:
	chietiPy/web2py/applications/admin/sessions/127.0.0.1-d753657d-d436-46e3-81ad-136e43841dd3
	chietiPy/web2py/applications/chieti/controllers/default.py
Merge branch 'master' of https://github.com/stefanoantonel/Chieti.git