2014/5/14_ 8.31pm
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/controllers/SiteController.php