block news
Merge remote-tracking branch 'origin/master'

Conflicts:
	information/templates/news_item.html
	pages/templatetags/helper_show.py
block news