copy over b63bb0 import fixes to xblock/reference/plugins.py
version 1 of the user service, supporting get_current_user
Adopt changes
Merge branch 'jbau/user-service' of github.com:edx/XBlock into feature/xblock-services

Conflicts:
	xblock/reference/user_service.py
Merge changes