Added weather widget
Merge branch 'master' of https://github.com/FusionLabsKiosk/LiveStream

Conflicts:
	scripts/main.js
	window.html