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

Conflicts:
	core/config/ConfigBB.php
Merge branch 'master' of https://github.com/skygreen2001/betterlife