remove anonymous id bindings
Merge branch 'jbau/xblock-user-service' of github.com:Stanford-Online/edx-platform into feature/xblock-services

Conflicts:
	cms/djangoapps/contentstore/views/preview.py
	lms/djangoapps/courseware/module_render.py