Update
Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	slai/models.py
	slai/templates/slait/body.html
	slai/templates/slait/day.html
	slai/templates/slait/index.html
	slai/templates/slait/list.html
	slai/templatetags/slai_extras.py
	slai/utils/li.py
	slai/views.py