FIX minor doc error
Update composer version
Composer fix
Merge branch 'master' of github.com:symfony2admingenerator/AdmingeneratorGeneratorBundle into v1.1
Fix composer
Merge branch 'v1.0' into v1.1

Conflicts:
	composer.json
Merge branch 'v1.1' of github.com:symfony2admingenerator/AdmingeneratorGeneratorBundle into v1.1