Merge branch 'master' of git://github.com/vincenttouzet/AdminConfigurationBundle into 2.1

Conflicts:
	Resources/config/routing.yml
Update composer.json
Replace : by ___ for the input
Merge branch 'fix_chosen' of git://github.com/vincenttouzet/AdminConfigurationBundle

Conflicts:
	Resources/config/routing.yml