de2:button7/8 done
Merge branch 'button7' of github.com:tonglil/zap into button7