default files, and server build fix
Merge pull request #29 from pedronasser/master

server build fixes