Merge the latest approved design

Merge the latest approved design with multi-language support. This version also supports bbapp and b3.