Added collective.recaptcha to buildout and proper branches for the discussion feature
Merge remote-tracking branch 'origin/devel-discussion' into devel
freeze some versions for windows buildout