Merge remote-tracking branch 'remotes/origin/roman' into andrey

Conflicts:
	class/city/citymodel.php