Merge origin/master

Conflicts:
	app/config/components.php
	app/modules/main/models/Act.php