Fix unquoted path in PREG expression on Windows (#1489290)

Conflicts:

	CHANGELOG
	program/lib/Roundcube/bootstrap.php
Fix last commit conflict
Fix Junk folder icon alignment when it's nested in inbox folder (#1489292)
- reverted commit 856ec447fa0a7ddd0ad19ed57fc0031040037284 which shouldn't
  be cherry-picked from master
Fix handling of non-default date formats (#1489294)
- remove ambiguous m/d/Y format from default config

Conflicts:

	CHANGELOG
	config/main.inc.php.dist
	program/lib/Roundcube/rcube_utils.php
	tests/Framework/Utils.php
Fix small style glitch on first toolbar button in recent Firefox
Fix display issue after moving folder in Folder Manager (#1489293)

Conflicts:

	CHANGELOG
Fix so additional headers are added to all messages sent (#1489284)

Conflicts:

	plugins/additional_message_headers/additional_message_headers.php
	program/lib/Roundcube/rcube.php
Fix identity selection on reply (#1489291)
Fixed variable name (changed unintentionally in last backporting commit)
Fix wrong close tag in /template/mail.html (#1489295)
Fix bugs when invoking contact creation form when read-only addressbook is selected (#1489296)
Fix lack of Reply-To address in header of forwarded message body (#1489298)
Fix setting of Junk and NonJunk flags by markasjunk plugin (#1489285)
Added possibility to register flag mappings by a plugin.

Conflicts:

	plugins/markasjunk/markasjunk.php
	program/lib/Roundcube/rcube_imap_generic.php
Fix newmail_notifier issue where favicon wasn't changed back to default (#1489313)
Fix issue where legacy config was overriden by default config (#1489288)

Conflicts:

	CHANGELOG
Fix iframe scrollbars on webkit browsers (#1489306)
Bump version and update Changelog
Merge branch 'release-0.9' of https://github.com/roundcube/roundcubemail into ipax-0.9