update
Merge branch 'master' of https://github.com/davidHuanghw/yuezican

Conflicts:
	.gitignore
	Application/Home/Controller/HomeController.class.php
update