wr
qq
Merge branch 'alex' of git@github.com:yakushevav/mt.git

Conflicts:
	news.php