Add tmp/pids folder.
Merge pull request #1744 from resolve/symlink_tmp

Fixes #1743
Allow 404 page to have custom view/layout templates.
Merge pull request #1746 from resolve/custom_view_and_layout_404

Allow 404 page to have custom view/layout templates.
Only seeds the about page on the creation of the homepage
Merge pull request #1748 from jamesalmond/about_page_seed

Only seed the about page on the creation of the homepage
Decrease coupling by using available methods.
Rename all .rb templates which contain erb to .rb.erb.
Fix deprecation warnings.
Bring back warning about not being able to load config/environment.rb in spec_helper.
Add note to changelog about #1746.
Merge pull request #1755 from gwagener/decrease_coupling

Decrease coupling by using available methods
Rails 3.2.6 automatically include url helpers from mounted engines into integration tests so there is no more need to include them manually.
Translate some keys in French.
Merge pull request #1757 from magicienap/i18n_fr

Translate some keys in French.
New version of journey gem was released so we can finally drop sub("//", "/") workaround.
Stub force_ssl config instead of using begin/ensure
Merge pull request #1750 from resolve/issue_1749

Rename all .rb templates which contain erb to .rb.erb.
Add anonymous controller route in spec.
Revert "Use event delegation for detecting modal dialog links."

This reverts commit d0cef214a301e4fa4f0b9fcaa9f9fa9a338d10b4.

This broke existing functionality where dialog information would be stripped
from the anchor's href. Also caused issues where the querystring would start
with & instead of ?.

Please re-submit when the code does not have these problems.

Conflicts:

	core/app/assets/javascripts/refinery/admin.js.erb