new client code
merge changes

merge changes from Bob’s xcode pull request
Merge branch 'robertlight-master'

merging changes from Bob on xblock