using buildout from "professional plone programming" book
Merge branch 'master' of github.com:sarmbruster/fireplone

Conflicts:
	versions.cfg
upgrade to Plone 4.2.5