[john] - right-to-left scripts/Arabic forms UI
Rails 3.2.17 security bump.

Conflicts:
	Gemfile.lock

Conflicts:
	Gemfile.lock
[john] - [bug] adding modules creates RTL style module

- no longer modifying the editor settings, but merging the settings into a new store
[john] - using CDN host for uploaded assets if it's available, otherwise use S3 bucket directly
Merge remote-tracking branch 'upstream/develop' into develop
Make SendGrid host and TLS configurable

SendGrid provide unique host names for high volume users, partially to
protect against DDOS attacks. Allow the SendGrid host to be set as the
SENDGRID_HOST environment variable.

Allow TLS to be configurable.
Merge branch 'feature/sendgrid_host' into develop-fftf

Conflicts:
	config/initializers/mail.rb