WIP on doing calendar filter
Merge branch 'master' of https://github.com/jsexauer/GreenButtonActuator
Updated UI
Merge remote-tracking branch 'origin/web_changes'

Conflicts:
	GreenButtonActuator.py