Added documentation for MenuBlocks
added references and merged comments
adjust doc to cmf_is_linkable addition
documenting the odm fallback locales listener
Add doc about ChildInterface and ChildExtension
Merge pull request #409 from EmmanuelVella/child-doc

Add doc about ChildInterface and ChildExtension
Merge pull request #413 from symfony-cmf/odm-listener

documenting the odm fallback locales listener
Merge branch 'master' into dev
[#414] Moved all 1.1 features to dev
Merge branch 'phiamo-master' into dev
[#397] Minor tweaks
update documentation for jackalope configuration
add more xml configuration examples
Fixed Repository Initializer example
Merge pull request #424 from symfony-cmf/fix_repository_initializer

Fixed Repository Initializer example
typo fixes discovered while using examples for configuration tests
final cleanups
Merge pull request #419 from symfony-cmf/phpcr-parameter-updates

Phpcr parameter updates
[#419] Continueing the great work of @dbu
Merge branch 'master' into dev

Conflicts:
	bundles/phpcr_odm.rst
	cookbook/editions/cmf_sandbox.rst