next iteration
Merge branch 'master' of github.com:nsargeant/fritzbit
update server
Merge branch 'master' into wemo
might break things