Update GettingStarted & GuidedTour to master

Change-Id: Id9624a3e8a8c90e8b52a45f1f9bdd1ff59144638
Merge "Update GettingStarted & GuidedTour to master" into wmf/1.22wmf8