Add plone.api and plone.app.robotframework in setup.py refs #5725
Merge branch 'master' of github.com:affinitic/cpskin.menu

Conflicts:
	setup.py