fix form Bug
Merge remote-tracking branch 'origin/master'
fix resend bug
fix list bug