Fixing bug on Xavante start-server
Merge branch 'master' of https://github.com/Etiene/sailor