ey
Merge branch 'alex'

Conflicts:
	news_page.php