v 1.7
Merge remote-tracking branch 'origin/master'

Conflicts:
	blog/views.pyc
	db.sqlite3