some bug fixed
Merge branch 'master' of https://github.com/edigotlieb/Server-backend.git