Мелкие изменения
Слияние
Merge branch 'master' of github.com:gadmag/blogyii

Conflicts:
	protected/runtime/application.log
Merge branch 'master' of github.com:gadmag/blogyii