added missing space between words
Merge pull request #2455 from jedgalbraith/patch-1

added missing space between words
change actionmailer dependency to avoid dependency conflict.
Add a note on installing rails before installing RefineryCMS

The issue was reported here https://github.com/refinery/refinerycms/issues/2418
fixes refinery/refinerycms#2450 but requires globalize to be updated with globalize/globalize#296.
update globalize3 ~> 0.3.0 to globalize ~> 3.0.1
Bump Rails version mentioned in the guides.
Fix double "sessions" in ru locale
Require globalize, not globalize3
Fix dependency resolution apparently
Merge remote-tracking branch 'shioyama/issue_2450_globalize' into 2-1-stable
Merge pull request #2457 from buithehoa/patch-1

Add a note on installing rails before installing RefineryCMS
Upgraded Refinery to 2.1.1
Add missing '[' to changelog.
Bump selenium-webdriver ~> 2.38.
Conflicts:
	testing/refinerycms-testing.gemspec
Remove carriage return from NOTE to fix its display.
Shelly Cloud installation guide

Shelly Cloud guide: error correction, polishing

Shelly Cloud guide: remove br tags, fix Step 13 link

Shelly Cloud guide: replace html #, clarifications

Shelly Cloud guide: make it more neutral
Fixed some of the formatting in the Shelly Cloud guide.