Merge pull request #2 from rostikoff/feature

v1.4
v 1.4
Merge remote-tracking branch 'origin/master'

Conflicts:
	blog/views.pyc
v 1.5
Merge pull request #3 from rostikoff/feature

v1.5
123