Fix composer.json
Update routing
Add new types and create demo types
Merge branch 'master' of git://github.com/vincenttouzet/AdminConfigurationBundle into 2.1

Conflicts:
	Resources/config/routing.yml