city service setting up in FOSUSERSERvice
Merge branch 'development'