#665 do not show remove button for sections that cannot be removed from sitemap
Updating finders for rails 4
[#684] Forgot Password should work

There are two forgot password pages, one of public, one for CMS users.

* Write Reset password scenario
* Implement 'Reset Password' so public users can access it.
* Bump version to 4.0.0.beta for testing release.
* 'Forgot Password' shows a CMS styled form (even when an error occurs)
* Move 'Forgot' to a more prominent place on the sign in.
fix bootstrap modal use for "add content"
fix bootstrap modal use for "edit form field"
Merge pull request #690 from andyoll/fix_exception_template

fix error reporting on attempting to save content_block instances
Merge pull request #686 from andyoll/fix_s3_attachments

allow config for: s3_host_name
Merge pull request #683 from jamesprior/master

#665 do not show remove button for sections that cannot be removed from ...
[#694] Generate blocks with 'show' syntax

* Also organized listing of fields using <dl> elements for easier styling.
[Fixes #689] Portlets with parameters

Portlets that have parameters (other than id) will now work when being viewed in the edit mode. There may be issues if portlets want an :id paremeter since there is assumed to be the page id. Hopefully this won't be a problem in practice since Addressable content could be used (or upgrading sites can scope the parameter to something thing_id)

* Set up scenarios to cover portlets that have/need parameters
* Add the existing params to the content iframe link.
[Fixes #681] Updating page titles inline

When editing page title, we don't need to update the connector movement paths, so it no longer tries to send the routes information for a given container.
Merge remote-tracking branch 'upstream/master'