Sunday's work
(cherry picked from commit c044a6e)
Merge remote-tracking branch 'origin/master'

Conflicts:
	blogengine/urls.py