try to fix broken tests
Merge branch 'jbau/xblock-user-service' of github.com:Stanford-Online/edx-platform into feature/xblock-services
fix unrelated test that was failing
Merge branch 'jbau/xblock-user-service' of github.com:Stanford-Online/edx-platform into feature/xblock-services
Adding authors