t
Merge branch 'alex' of github.com:yakushevav/mt

Conflicts:
	news.php