Changed all string concatenations like $Model->alias . '.' . $field to the more consistent $Model->escapeField($field).
adding a tls option to SmtpTransport to support TLS SMTP servers like MS Exchange 2010
Merge branch '2.3', remote-tracking branch 'origin' into feature/smtp-tls
Merge pull request #727 from dereuromark/2.3-missing-app-uses-fix

correcting previously added app uses statements
Removed inline method calls in curly braced string concat's.
Add missing import.
Invert default log configuration.

Windows only has 4 log levels instead of 8.  This causes notice errors
when trying to use 'alert' and a few other levels.

Fixes #3055
Make tests pass on windows.

Need to shuffle around log levels to work with the 4 levels on windows
instead of the 8 on *nix systems.

Refs #3055
Merge branch 'master' into 2.3
Add ability to disable content-disposition for email attachments.

This solves issues with outlook and text/calendar attachments.

Refs #3042
Add tests for contentDisposition flag.

Fixes #3042
Add docs.
another correction for app uses
Merge pull request #730 from dereuromark/2.3-missing-app-uses

another correction for app uses
fix for windows. the check seems to be the wrong way. at least compared to the one in the rss class itself
different approach on the failing test
Fix associated translations being inserted.

Due to changes introduced in [1c0b6c076a15516688df5c6474392fa8e79bb010]
associated translations would incorrectly be saved with a value of ''.

Fixes #3057
Merge branch 'master' into 2.3
Add bcrypt support to Security::hash()
Simplify number formatting.