HWP-0004 Added Button2
Merge branch 'HWP-0004'