Work on sleep entry a bit
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/js/services.js
	www/templates/tab-diary.html
Remove cruft