Checkout master at the end
fixed events links on helppage
Merge branch 'master' into kingman