[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