noscript
Merge remote-tracking branch 'origin' into master_mail

Conflicts:
	protected/controllers/SiteController.php
	protected/views/layouts/main.php
timer