First pass at retry and email error submission button.
Changed tour submission error messaging
Merge branch 'toursubmission'