Merge pull request #5172 from edx/jsa/tnl24

test that group_id attribute is present and correct in LMS responses
Remove Django Waffle
Merge pull request #5165 from lduarte1991/lduarte-harvardx-pr25

Annotation Tool: Fixed TinyMCE issue when changing units
Convert unicode emails to byte strings for CSV grade reports
[TNL-288] Annotation Tools: Give staff/instructors full permissions

 - changed role to 'in' condition

 - fixed comment about get_real_user

 - Adding Tests and Fixing Pep8 Violations
Merge pull request #5170 from edx/muhhshoaib/Ex-79-BUG-if-no-coupon-code-defined-registration-codes-modal-dialog-box-does-not-appear

Ex-79 Bug Fixed. If there is no coupon code, 'Generate Registration Codes' modal dialog does not appear.
Html escaped from display name in xblock.
LMS-11194
Fixed video not playing after changing speed to anything other than 1.
BLD-1221
Merge pull request #4749 from edx/waheed/lms11194-xblock-allow-html-and-script-in-dusplay-name

Html escaped from display name in xblock.
Merge pull request #5055 from edx/waheed/bld1221-fix-video-not-play-in-firefox-on-speed-change

Fixed video not playing after changing speed to anything other than 1.
Cancel the new post resets the state of form

When user is creating new post and then cancel it
the data remains in the form which appears when we
click on new post again. The state of form should
be reset.

TNL-148
Explain query counts
Fix trivial excesses (2 splits configured & don't fetch courses if there are none)
LMS-11220, LMS-11391, LMS-11390
Get rid of unused fragment
Get rid of obsolete field checking
Merge pull request #5209 from edx/cdodge/allow-to-pass-override-cancel-URL

pass along an extra parameter to CyberSource to sepcify a callback URL i...
Merge pull request #5195 from edx/renzo/remove-waffle

Remove Django Waffle
Merge pull request #5032 from mlkwaqas/waqas/tnl148-reset-newpost-form-on-cancel

Forums new post form should reset state when user cancels
Update translations (autogenerated message)
Merge pull request #5183 from edx/renzo/new-audit-track-selection

Prepare track selection page for new audit track
Merge pull request #5210 from edx/sarina/09152014-translation-update

Update translations (autogenerated message)