start prep to use global help and config by adding help to webapp
Merge remote-tracking branch 'origin/master'