last commit
Merge branch 'master' of https://github.com/danieledipompeo/vecchiaposta

Conflicts:
	dump.sql
	web/contents/config.cfg