commit
Merge branch 'master' of github.com:zhaozhang/ladle-computing

Conflicts:
	trunk/yipiao/web/controllers/SiteController.php
commit