fix bug, and move some value to constant
Merge remote-tracking branch 'origin/master'

Conflicts:
	DragonBall/dragon_ball_config.php