Added prompt to save changes or cancel when switching between steps.
Merge remote-tracking branch 'origin/master'