Fixed line breaks in notes and warnings in guides.
Merge pull request #2074 from gwagener/guide_line_breaks

Fixed line breaks in notes and warnings in guides
Merge remote-tracking branch 'refinerycms/2-0-stable' into 2-0-stable
Added note about using raw to mark HTML as safe.

Fixes #2078
Updated Rails 3.1 + Devise guide.

Fixes #2073
Ensure that when editing a page that locales are properly cared for.
Updated to globalize3 version 0.3.0

Fixes #1461
Merge pull request #2088 from refinery/issue_1461

Ensure that when editing a page that locales are properly cared for.
Revert "Tidy code out of case statement into single conditional."

Refactored code is not the same as the original. See detailed
explanation in https://github.com/refinery/refinerycms/issues/2097.
Lock down truncate_html version to 0.5.x.

Next version after 0.5.5 is 0.9 and it dropped Ruby 1.8.7 support but
we're still supporting it.

Conflicts:
	core/refinerycms-core.gemspec
Merge remote-tracking branch 'refinerycms/2-0-stable' into 2-0-stable

Conflicts:
	[RESOLVED] doc/guides/5 - Using Refinery as an Engine/2 - With an existing Rails 3.1 + Devise app.textile
[Doc] How to manage users over refinery_users