Efischer/merge release to master

Bump ora2 version

AC-223 updating transcript skip links

Merge release into master

Fixed unable to created ccx issue 

Patch/2015 04 06

asadiqbal08/WL-388: Add ModuleI18nService for Descriptor System

Making migrations in-sync with models.

TNL-4296

TNL-4296

TNL-4345: Remove include linting

ECOM-4040

Bump ORA version.

Update translations (autogenerated message)

- Remove <%include> linting
- Remove dump_html_escaped_json

Revert "Disallow free verified course modes"

ECOM-3910

clean up and fix quality violations

since get_course can never return None, we can remove these lines

- Icon images can be uploaded from the django admin
- Test coverage improved

Disallow free verified course modes

mattdrayer: Default to XBlock class if no unmixed class

[PERF-274] Add NewRelic instrumentation to contentserver.

This includes the course key/path for a given contentserver request,
whether or not the asset is locked, cacheable, has been modified, etc.

This should give us some better insight as to what sort of requests are
coming into the contentserver to figure out whether or use of a CDN in
front of these assets is as efficient as effective as it could be.

LTI-9 - Bug with sending back grades for a non-leaf blocks on devstack

Fixed progress page grade requirements text.