Merge master into HEAD

Conflicts:
	app/modules/main/controllers/ActController.php