960 home, 960 eventi fix e cleanup
Merge branch 'master' of github.com:arcadiaproject/arcadiaproject