release
Merge branch 'master' of https://github.com/ploneUN/ksp.buildout

Conflicts:
	buildout.cfg