initial server commit
Merge branch 'master' of https://github.com/hverespej/sw-2014-09-19