Merge origin/master

Conflicts:
	frontend/controllers/SiteController.php
Merge origin/master