обновил админку
обновил
Merge branch 'master' of https://github.com/range-web/das

Conflicts:
	protected/controllers/PromController.php
	protected/messages/de/common.php