update opaque keys dependency to fix install
Bump opaque_key dependency to 0.1.1
Allow xblocks to be added as advanced problem types
shim to update ruby/node, not python reqs
missed commit
Fixed MATLAB Run Code bug with answer boxes.
LMS-2807
Merge pull request #4099 from edx/andya/rc-xblocks-as-advanced-problems

Allow xblocks to be added as advanced problem types
Merge pull request #4111 from edx/waheed/lms2807-matlab-run-code-bug-fixed

Waheed/lms2807 matlab run code bug fixed
Fix i18n in ChoiceGroup and ChoiceTextGroup.
Release notes 6/17/2014
Fix i18n translation issues
Use ngettext rather than "word(s)" for plural phrases
Add missing $ at the end of the MKTG URLs
Merge pull request #4121 from edx/sarina/fix-i18n-bugs

Fix i18n translation issues
Merge pull request #4120 from edx/sylvia/docs/release_notes_6_16

Release notes 6/16/2014
Merge branch 'release'
Merge pull request #4141 from IONISx/tusbar/end-mktg-urls

Add missing $ at the end of the MKTG URLs
Remember the user last thread sort preference
FOR-545
Merge pull request #3738 from mlkwaqas/waqas/for545-user-last-thread-not-remembered

Waqas/for545 user last thread not remembered
Fix case where DB gets populated with string None