Updated Wordpress samples to correspond to those deployed with Moodle
Merge pull request #1396 from benjamij/wordpress-sample-updates

Updated Wordpress samples to correspond to those deployed with Moodle
Fix SSO issues in Activitystream control
Merge pull request #1397 from fmoloney/Fixes

Fix SSO issues in Activitystream control
Merge pull request #1398 from priand/playground2

Playground2
Merge pull request #1399 from priand/playground2

Playground accepts the environment as part of the URL
Merge remote-tracking branch 'upstream/master' into playground2