Form Cancel Button relabeled "Reset" Fixes #196
Merge remote-tracking branch 'origin/production'