pep8
Merge branch 'master' of github.com:ploneintranet/ploneintranet.workspace

Conflicts:
	src/ploneintranet/workspace/workspacefolder.py