Update routing
Add new types and create demo types
Merge branch 'new_fields' of git://github.com/vincenttouzet/AdminConfigurationBundle

Conflicts:
	Resources/config/routing.yml