Add resend approved button
Merge branch 'master' into production