123
201412291031
Merge branch 'master' of https://github.com/chengaoying/Education_dev_hipi

Conflicts:
	Application/Test/Controller/IndexController.class.php
	Runtime/Cache/Hd/66360daab730568f0545fbb85a7b7e2a.php
	Runtime/Cache/Hd/cfb908667d2443f09ecac18a03abf2ad.php