Possible fix for previewing pages with inherited templates.
added missing german translations; admin:  do not remove params parent_id while switching locale
Bump jquery-ui-rails to 4.1.1
Use current dragonfly api to setup datastore.
Merge pull request #2545 from refinery/dragonfly_api_change

Use current dragonfly api to setup datastore.
Merge branch 'master' of git://github.com/refinery/refinerycms
Bump awesome_nested_set to 3.0.0.rc.3
we made it to 2014
Merge pull request #2547 from djones/master

We made it to 2014
Use correct attribute (href) in canonical link. Full path preferred.

add spec for canonical link

spacing
Merge pull request #2543 from ghoppe/fix-canonical-link

Use correct attribute (href) in canonical link. Full path preferred.
Merge branch 'master' of https://github.com/refinery/refinerycms
Split extension guide out of getting started guide.
Clarify instructions for mounting to non-root
'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