after hours to all hours
Merge branch 'master' of https://github.com/peterkhayes/Doorbell
fixed after hours logic
Merge branch 'master' into dev

Conflicts:
	client/index.html