Merge branch 'mvo/update_bok_choy_db_caches' of https://github.com/edx/edx-platform into mvo/update_bok_choy_db_caches

Annotation Tools: Added Grouping Plug-In

- adding comments

 - spacing issues and indentation

TinyMCE Plugin: Added media plugin to TinyMCE for the Annotation tool

removing rake and  outdated references to it

Request IFRAME API every time with https scheme.

update export_all_courses management command to count and list all faile...

Correct UnboundLocalError exception in student_migration_35

BLD 1020: Easy access to Group Configurations page from Content Experiment component.

- fixed missing media and link buttons on image

 - fixed a CSS issue with the sharing button

Jarv/rsyslog handler

Text Annotation Tool: Safari Colored Highlights Bug Fix

Annotations Tools: Fixing major Firefox/Tinymce bug in annotations

eCommerce enhancements (pt. 2)

 - fixed spacing

Fix failing video tests due to wrong IFRAME_API_RESPONSE 

Allow verified to be offered without audit

 - fixed issue in Firefox where the init gets called multiple times

 - fixed spacing issues and added more comments

 - fixed indentation, added missing parens in comment, and fixed typo

Fix filter with new opaque key, allowing user to set COURSE_LISTING as o...

Add little more logic for paid courses

added CoursmodeArchive model to save the old prices history

analytics -> instructor_analytics

analytics -> instructor_analytics

Redirecting to dashboard after free user enrollment.

added the suggested changes by cdonge

rebased and resolve conficts with cdoge/registration_codes

feature enhancement request: added transaction group name text field to the download buttons as an extra optional query paramerter

Course Instructor as financeadmin role, will be able to download all purchase transactions in the course as a CSV file