news
Merge remote-tracking branch 'origin/master'

Conflicts:
	base/kinobase.sql
	protected/models/Serial.php
а