Made triggerContinue() reset entry and action
Merge branch 'master' into website