fix server
Merge branch 'master' of https://github.com/jrafidi/2.744-Sp14