include FindCityById to user & property city in entity User
Merge branch 'develop' of git://github.com/antwebes/ChateaClientBundle into develop