update bok choy db caches
Refactor LMS Video Tests
Decrease Video Player Init Wait Timeout
Annotation Tools: Added Grouping Plug-In

- adding comments

 - spacing issues and indentation
Merge pull request #4504 from lduarte1991/lduarte-harvardx-pr11

Annotation Tools: Added Grouping Plug-In
update bok choy db caches
Merge branch 'mvo/update_bok_choy_db_caches' of https://github.com/edx/edx-platform into mvo/update_bok_choy_db_caches
Merge pull request #4636 from edx/mvo/update_bok_choy_db_caches

update bok choy db caches
Merge pull request #4715 from edx/ammar/decrease-video-player-init-timeout

Decrease Video Player Init Wait Timeout
Merge pull request #4261 from edx/ammar/video-tests-refactoring

Refactor Bok-Choy LMS Video Tests
Fix property call issue
Merge pull request #4731 from edx/ammar/fix-property-call

Fix property call issue
BLD-1125: Validation of content experiments after managing a group.
Added styling.