fix
fix bufg settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	classes/cls_settings.php