Fixed link to the symfony-cmf-website repository
Merge pull request #454 from peterrehm/patch-1

Fixed link to the symfony-cmf-website repository
Removed direct references to old repo
Reread Quick tour
Fixed identation mistake
adjust tree browser bundle documentation
Merge pull request #479 from symfony-cmf/treebrowser

adjust tree browser bundle documentation
Merge branch 'master' into dev

Conflicts:
	bundles/simple_cms/introduction.rst
	bundles/tree_browser/introduction.rst
Removed merge conflict
removing obsolete information
Merge pull request #482 from symfony-cmf/locale-cleanup

Locale cleanup
cleanup annotation namespace for phpcr odm
Merge pull request #481 from symfony-cmf/cleanup-phpcrodm-annotation

Cleanup phpcrodm annotation
Added "teaser"
Merge pull request #478 from symfony-cmf/se_update

Updated Quick Tour for 1.1
as Midgard is not PHPCR 2.1 compatible, lets remove it for now
Merge pull request #483 from symfony-cmf/remove_midgard

Remove midgard
cleanup according to feedback
Merge remote-tracking branch 'origin/dev' into cookbook-sonata

Conflicts:
	cookbook/handling_multilang_documents.rst