walkthrough edits
Merge branch 'master' into pinauthintegration