finish form
Merge branch 'dev_thinkpad'

* dev_thinkpad:
  finish form