Adding O3654-W back to master and also promoting O3657-1 to master too.
Merge branch 'master' of https://github.com/OfficeDev/TrainingContent