fixed select server bug
Merge branch 'develop'