Merge origin/master

Conflicts:
	protected/controllers/SiteController.php
	protected/models/RequestForm.php