Added support for @canonical in pages_controller.

Fixes #1472
fixed engine generation view that had hardcoded "title" attribute
extra a in the sentence
Add admin_dialogs_path and use that in wym setup.

Conflicts:

	core/app/assets/javascripts/refinery/boot_wym.js.erb
Bug fixed in Firefox 11. In the image picker popup, the content is blank until you move the popup.
Add changelog entry about #1637.
add ru locales for preview button
Add temp fix for #1595.

Conflicts:

	core/app/assets/javascripts/refinery/submit_continue.js.coffee.erb
Use proper template location for admin error_404.
Re-enable controller back-end access checking.
Fix failing specs.
Fhere are no 'refinery_login_with' and 'logged_in_user' methods available in 2-0-stable.
Manually preload the :translations to avoid the N+1 queries.
Combined patches and linked to a PR in awesome_nested_set where passing a relation *will* work.
Implement feedback from @ugisozols.
Merge remote-tracking branch 'jipiboily/engine_generator_fix' into 2-0-stable
Fixes #1628 by updating Dragonfly API usage.
Fixes #1568 by removing errant documentation.
Merge pull request #1654 from resolve/issue_1628

Fixes #1628
Merge pull request #1653 from resolve/pull_1633

Replaces #1633
Fixes resolve/refinerycms-search#16

This works by allowing refinery.url_for(Refinery.route_for_model(result.class, :admin => false)) to be used in place of refinery.url_for(result)
Increment version to 2.0.4