Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
refs #160 delete relational files of bx_resource_setting.
Merge branch 'refs-160'