Adding new attribute to the xmodule_runtime to check admin privileges on users
Merge pull request #3805 from edx/sanchez/TIM-563-Check-Django-Admin

Adding new attribute to the xmodule_runtime to check admin privileges on users
Merge remote-tracking branch 'edx/master' into ok-merge-from-master

Conflicts:
	lms/djangoapps/courseware/module_render.py
Resolve conflicts
Merge pull request #3856 from cpennington/ok-merge-from-master

Merge from master to opaque-keys