integrato origin/test
Merge remote-tracking branch 'origin/test'

Conflicts:
	app/main/area/_head_ext.lua
	app/main/area/_list_entry_ext.lua
	app/main/area/_list_ext.lua
	app/main/area/show_ext.lua
Merge pull request #65 from pierangelo/master

Task C2 - C3