Merge branch 'master' of https://github.com/BrightcoveLearning/VideoCloudMediaAPI

Conflicts:
VideoSessionsMaterials/paging-results.pptx
resolving conflict