Merge branch 'develop' of git://github.com/antwebes/ChateaClientBundle into develop
Merge branch 'develop'