test
Merge branch 'master' of github.com:qdayy/2014.juhe

Conflicts:
	Juhe/Home/Controller/IndexController.class.php