- package.json and proper static files serving
Merge remote-tracking branch 'upstream/master'

Merging server/client