bunch of fix
Merge branch 'master' of http://github.com/collective/collective.generic.skel