Fixing server launch
Merge branch 'master' of git://github.com/guluc3m/gul-zoe