two places in server with ids
Merge branch 'master' of github.com:joakimmj/Wapp