before merge
Merge branch 'branch1' of https://github.com/xun91/BoJio into branch1
update ui