fixed city issue in signup 2
Merge branch 'develop' into salon