Possible fix for previewing pages with inherited templates.
Bump jquery-ui-rails to 4.1.1
Merge branch 'master' of git://github.com/refinery/refinerycms
Bump awesome_nested_set to 3.0.0.rc.3
Merge branch 'master' of https://github.com/refinery/refinerycms
'engine' -> 'extension'. Update name of Testing Guide. Explain commands to run after generating extension. Explain 'author missing' warning.
Add spec tests for checking that the thumbnail strip option works
Add dragonfly image strip process for compatibility
Merge pull request #2560 from complistic-gaff/fix-image-split-option

Dragonfly::Register::NotFound (:strip not registered)
Merge branch 'master' of https://github.com/refinery/refinerycms
Merge pull request #2564 from greendog/master

Bump jquery-ui-rails to 4.1.1 and awesome_nested_set to 3.0.0.rc.3
Add missing changelog entries.
Add release date for 2.1.2.
update the extending models guide for rails 4 and strong paramaters

make background image code format

instead of overwriting the page_params method, recommend using
alias_method_chain
Merge pull request #2565 from jess/guide_update

update the extending models guide for rails 4 and strong paramaters
Update 1 - Menu Presenter.textile

Spelling mistake
Add custom_slug in the allowed params list.
Merge remote-tracking branch 'weedySeaDragon/2544-gemspec-author-note--engineToExtension'
Merge pull request #2388 from Rakoth/master

Possible fix for previewing pages with inherited templates.
Add spec test for checking that the "Add Image" to page button works and that the image on the page still works after updating the image.