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

Conflicts:
	information/templates/news.html
Merge remote-tracking branch 'origin/master'