site
Merge branch 'master' of github.com:leftarrow/readyfortakeoff

Conflicts:
	protected/controllers/SiteController.php