Daniel
server merge
Merge branch 'master' of https://github.com/kubalaj/mobile_hackathon