Initial commit.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	diary/app.yaml
	diary/static/css/lightbox.css
	diary/static/css/main.css
	diary/static/js/diary.models.js
	diary/templates/index.html
Added main navigation toolbar and moved `timeline` and `go to today`
buttons to it.