Fix problem with invalid JSON format
Merge pull request #566 from bocharsky-bw/patch-1

Fix problem with invalid JSON format
Register classes

Register these classes in the dependency injection container configuration:
This should be in the services.yml, right?
Merge pull request #569 from DoneBySimon/patch-3

Register classes
services instead of config

The menu provider should be registered in the services, not in the config, right?
Services instead of Config
Grammar fix

Conflicts:
	quick_tour/the_model.rst
Merge pull request #571 from DoneBySimon/patch-5

services instead of config
Merge pull request #572 from DoneBySimon/patch-6

Services instead of Config
Fix typo: indentation typo in yaml configuration.
Merge pull request #574 from dreamhood/patch-1

[routing-auto-bundle] Fix indentation typo in routing auto bundle yaml configuration example
Fixed filename in comments
seo corrections
minor #575 seo corrections (cordoval)

This PR was submitted for the dev branch but it was merged into the master branch instead (closes #575).

Discussion
----------

seo corrections

|Q            |A                                                  |
|---          |---                                                |
|Bug Fix?     |n                                                  |
|New Feature? |n                                                  |
|BC Breaks?   |n                                                  |
|Deprecations?|n                                                  |
|Tests Pass?  |n                                                  |
|Fixed Tickets|https://github.com/symfony-cmf/SeoBundle/issues/146|
|License      |MIT                                                |
|Doc PR       |                                                   |

Commits
-------

b917a73 seo corrections
f0d455e Fixed filename in comments
fix layout error
Use statement for Template annotation
Update getting-started.rst

There was a typo with phpcr/phpcr-bundle version. It was using 1.0.0 and 1.1.* at the same time, replacing 1.0.0 with the newer (1.1.*) in first line.
Merge pull request #578 from robhunt3r/patch-2

Update getting-started.rst
Update create_new_project_phpcr_odm.rst

Tutorial was using older version (1.0.0) of doctrine/phpcr-bundle now using `1.1.*`
Merge pull request #579 from robhunt3r/patch-3

Update create_new_project_phpcr_odm.rst