Client stuff
server stuff
Merge branch 'master' of https://github.com/haakondw/toppurapp