Merge pull request #470 from edx/db/course-team-admin-grants

CHANGELOG.rst

cms/djangoapps/auth/authz.py

cms/djangoapps/contentstore/features/common.py

...ontentstore/features/component_settings_editor_helpers.py

cms/djangoapps/contentstore/features/course-team.feature

cms/djangoapps/contentstore/features/course-team.py

cms/djangoapps/contentstore/tests/test_checklists.py

cms/djangoapps/contentstore/tests/test_contentstore.py

cms/djangoapps/contentstore/tests/test_users.py

cms/djangoapps/contentstore/tests/test_utils.py

cms/djangoapps/contentstore/utils.py

cms/djangoapps/contentstore/views/assets.py

cms/djangoapps/contentstore/views/checklist.py

cms/djangoapps/contentstore/views/user.py

cms/static/sass/elements/_forms.scss

cms/static/sass/elements/_icons.scss

cms/static/sass/elements/_system-help.scss

cms/static/sass/views/_textbooks.scss

cms/static/sass/views/_users.scss

cms/templates/manage_users.html