Merge branch 'master' of https://github.com/skygreen2001/betterlife

Conflicts:
	core/util/common/UtilFileSystem.php
Merge branch 'master' of https://github.com/skygreen2001/betterlife