blog.php updated and menu added to discussion
Merge remote-tracking branch 'origin/master' into testing

Conflicts:
	css/pagination.css