Link fix attempt
Merge pull request #6007 from edx/markhoeber-dev-guide-link-fix

Dev Guide Link Fix
Remove 'eo' artifacts when doing common/lib test runs
Merge pull request #6012 from edx/sarina/remove-eo-artifacts

Remove 'eo' artifacts when doing test runs
implement user service to return currently-logged-in user
Merge branch 'jbau/xblock-user-service' of github.com:Stanford-Online/edx-platform into feature/xblock-services
Fix course service for cms
Merge branch 'feature/xblock-services' of github.com:feedbackfruits/edx-platform into feature/xblock-services

Conflicts:
	lms/djangoapps/courseware/module_render.py