Merge branch 'devel-fix' into devel
Merge branch 'devel-discussion' into devel
Merge branch 'devel-discussion' into devel
Get proper contextual whitelist settings
Added ploneboard and recaptcha dependecies
fixed test_get_observations_cp
Merge branch 'devel' into staging