fixed stuff
Merge branch 'wemo' of github.com:nsargeant/fritzbit into wemo

Conflicts:
	app.js
this prolly sucks