remove dev master dependencies
Merge pull request #484 from symfony-cmf/remove-dev-master-deps

remove dev master dependencies
Merge branch 'master' into dev

Conflicts:
	cookbook/creating_a_cms/getting-started.rst
	cookbook/creating_cms_using_cmf_and_sonata.rst
	cookbook/editions/cmf_sandbox.rst
	cookbook/installing_configuring_doctrine_phpcr_odm.rst
[8416330bbb8ab441c59c7334edfbdff87554af60] Reverted changing to old version