added encoding: utf-8 in core.rb.erb to allow i18n characters in config.site_name
Merge pull request #1717 from tdelam/master

Encoding in core.erb.rb
Referencing Heroku guides
Shorten all authentication routing helpers
updating to reflect note
Update doc/guides/7 - Hosting and Deployment/2 - Amazon S3 for Uploads.textile
Merge pull request #1718 from gogogarrett/master

Updating guides to reference heroku guide
Added Custom View / Layout Template guide.
Text -> Reformat Selection

[ci skip]
Micro optimisation with regexp
Merge pull request #1727 from Tranquility/master

Seeds for different languages
Merge pull request #1722 from resolve/doc-updates

Add Custom View / Layout Template guide.
ruby-debug19 appears to be broken on 1.9.3
`debugger` is a fork by @cldwalker that works on both 1.9.2 and 1.9.3
remove rails-inserted comments
Merge pull request #1730 from wenzowski/patch-2

ruby-debug19 appears to be broken on 1.9.3
Authentication redirection bug-fix which fixes #1561

* Fixed post-authentication redirect bug where users would
  always be redirected to the admin root after successful auth.
* Added tests for proper functionality.
Added session key check for unscoped `return_to` variable #1724
Move flag links outside of title span.

Until now these links were disabled by expand/collapse stuff.
Wrap flag icons in span.
Fixed page locale-flag edit link.