don't replace the content of an editor by default when adding a snippet
Merge pull request #525 from WouterSioen/mailmotor-overwrite

don't replace the content of an editor by default when adding a snippet
FIX: Form token usage in form builder.

When submitting a form with the form builder, this results in a
"something went wrong"; this is because the form generates a form token,
but since the form is built manually in the template, not taking
form_token into account, this results in a mismatch between the form
token in the session and that coming in from the form (that is to say;
none is coming in from the form).

Unfortunately, we cannot resolve to using {form:{$formName}} because
SpoonTemplate does not parse this correctly, so we built it manually
again in the template.

A better solution might be to fix SpoonTemplate so that it parses
{form:{$formName}} correctly, but I'd rather not touch external
dependencies and fork code in 1 change.

"accept-charset" when dealing with UTF8 was also broken, this changeset
fixes that too.

Closes #533
Merge pull request #534 from forkcms/fix-form-token

FIX: Form token usage in form builder.
Mailmotor: invalid HTTP status codes were used causing the AppKernel to throw exceptions.
Fix location extra url

Always linked to nl. Omitting it will result in the CMS automatically redirecting the request to the correct language.
Cleanup
Changelog fixed
The 3.6.1 version was delayed because of different bugs but the changelog was already prepared for the release. This commit unsets the date of the 3.6.1 release.
Merge remote-tracking branch 'origin/master' into azure