[refactoring]
Merge remote-tracking branch 'origin/master'

Conflicts:
	test/BitWebTest/CronModule/Serivce/CronServiceTest.php
[refactoring]