add support for static resurces - clean up
Merge branch 'master' of https://github.com/cbaeza/server