Commit Bug Fixed
Merge branch 'master' of https://github.com/dieend/PBD-server

Conflicts:
	DragonBall/AchieveChest.php
	DragonBall/dragon_ball_config.php