Added explicit wait for payment page to load
Merge pull request #1659 from edx/hotfix/revert-transcripts-protocol-validation

Revert "Don't allow users to enter video url's in http."
Merge pull request #1575 from cpennington/hotfix-memory-leaks

Improve memory profile during course grading runs
Merge pull request #1661 from edx/will/certificate-test-fix

Added explicit wait for payment page to load
Merge pull request #1658 from edx/db/remove-release-sh

Removed old release script
Fixed bug where Flash photo taker would fail

LMS-1487
Removed unused code
pep8/pylint fixes for capa
Fix misspelled word in test name
Merge pull request #1664 from edx/db/fix-test-spelling

Fix misspelled word in test name
Disabled test making external calls to YouTube
Merge pull request #1665 from edx/will/disable-transcript-youtube-test

Disabled test making external calls to YouTube
Fix for advanced settings failure
Revert "more granular transactions in grading [LMS-1480]"

This reverts commit 19dd49f35510f9713899534e049edbf1ffe1250a.
Merge pull request #1669 from edx/hotfix/revert_grading_manual_tx

Revert "more granular transactions in grading [LMS-1480]"
BLD-449: Fix rearrange bug in problems.
hidden-module-unicode: Return unicode string to pass assertion

XBlock Fragments expect unicode strings, and fail on an assertion when
it isn't:

```
2013-11-14 07:55:50,774 ERROR 3788 [django.request] base.py:215 - Internal Server Error: /courses/TestU/TST101/now/courseware/41d55c576a574fde99319420228f7f88/5fef5794e34842f4a2d45ebcdeaa9a3a/
Traceback (most recent call last):
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/core/handlers/base.py", line 111, in get_response
    response = callback(request, *callback_args, **callback_kwargs)
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/contrib/auth/decorators.py", line 20, in _wrapped_view
    return view_func(request, *args, **kwargs)
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/utils/decorators.py", line 91, in _wrapped_view
    response = view_func(request, *args, **kwargs)
  File "/edx/app/edxapp/venvs/edxapp/local/lib/python2.7/site-packages/django/views/decorators/cache.py", line 75, in _cache_controlled
    response = viewfunc(request, *args, **kw)
  File "/edx/app/edxapp/edx-platform/lms/djangoapps/courseware/views.py", line 407, in index
    context['fragment'] = section_module.render('student_view')
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/core.py", line 156, in render
    return self.runtime.render(self, view, context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 903, in render
    return block.xmodule_runtime.render(to_render, view_name, context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/runtime.py", line 356, in render
    frag = view_fn(context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/seq_module.py", line 77, in student_view
    rendered_child = child.render('student_view', context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/core.py", line 156, in render
    return self.runtime.render(self, view, context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 903, in render
    return block.xmodule_runtime.render(to_render, view_name, context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/runtime.py", line 356, in render
    frag = view_fn(context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/vertical_module.py", line 27, in student_view
    rendered_child = child.render('student_view', context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/core.py", line 156, in render
    return self.runtime.render(self, view, context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 903, in render
    return block.xmodule_runtime.render(to_render, view_name, context)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/runtime.py", line 356, in render
    frag = view_fn(context)
  File "/edx/app/edxapp/edx-platform/common/lib/xmodule/xmodule/x_module.py", line 464, in student_view
    return Fragment(self.get_html())
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/fragment.py", line 34, in __init__
    self.add_content(content)
  File "/edx/app/edxapp/venvs/edxapp/src/xblock/xblock/fragment.py", line 71, in add_content
    assert isinstance(content, unicode)
AssertionError
```
Merge pull request #1605 from edx/oleg/fix-rearrange-bug-in-problems

Oleg/fix rearrange bug in problems
Merge branch 'release'

Conflicts:
	cms/djangoapps/contentstore/views/item.py
Merge pull request #1667 from edx/will/really-fix-nav-test-issues

Fix for advanced settings failure