fixing bug on server
fixing bug on server
Merge branch 'master' of github.com:trivigy/social-mengdi
fixed a bug on server