15 min
Merge branch 'master' of github.com:mokujin90/madam

Conflicts:
	protected/controllers/SiteController.php