Updated gs.content.form
Updated gs.shim.content.form
Fixed order of shim versions
Merge branch 'master' of github.com:e-democracy/buildout-config

Conflicts:
	versions.cfg