Merge pull request #1 from tomasharkema/develop

Develop
wut?
ok
jo
Merge branch 'master' of https://github.com/tomasharkema/HomeAppv2-Server into develop
yay travis