v 1.6
Merge branch 'master' into feature

Conflicts:
	blog/admin.pyc
	blog/templates/blog/enter.html
	blog/urls.pyc
	blog/views.pyc
	db.sqlite3