progress on help page
major progress on help page
Merge branch 'master' into dev