fixed bug 2058
Merge branch 'develop' of https://github.com/Cloud-Star/ServerJEE into develop