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

Conflicts:
	chietiPy/web2py/applications/chieti/controllers/default.py