added HgResume files to a new 'server' folder
Merge branch 'master' into develop