modules description
Merge branch 'master' of https://github.com/biospank/paperclip-site

Conflicts:
	app/views/pages/bilancio.html.slim