Add a button
Add Button 1 string ID
Merge branch 'b1'