update plone version and bugfixing
fix conflicts and merge