version upgrades
Merge pull request #402 from plone/version-updates

upgrade versions