update
Merge branch 'master' of https://github.com/polyakov84/engine_vegatur

Conflicts:
	protected/modules/visa/controllers/VisaController.php