include FindCityById to user & property city in entity User
Merge branch 'develop'