Merge remote-tracking branch 'origin/peteripsen'
Merge branch 'master' of https://github.com/alfeko/NBServiceApp