更新
Merge branch 'master' of github.com:icatholic/iwebsite2

Conflicts:
	application/Bootstrap.php
	application/modules/lottery/controllers/IndexController.php