prepare composer
Merge branch 'master' of github.com:antwebes/ChateaClientBundle

Conflicts:
	composer.json