Fixed issue #244
Merge origin/master
Merge remote-tracking branch 'upstream/master'
Fixing typo
Merge pull request #235 from carcam/languagefixes

Fixing typo
Merge pull request #232 from xtech86/master

Wrapped jevpretoolbar, added missing override field and added config option on where to redirect when canceling an event.
Merge remote-tracking branch 'upstream/master'