no message
Merge commit 'ca5e6d87e07887c8b99f80fdf9dd92cdfb4f3374'

Conflicts:
	templatetags/tt_blog.py
Adding the photo display short code.