Conflicts:
	lms/templates/verify_student/make_payment_step.underscore

Placeholder image for Open edX Studio logo, when not running on edx.org

Stop mocks after test.

Remove LinkedIn integration

clean up reject_name_change email template a bit

Use {platform_name} in discussions header

Get students experiments, groups, and cohorts

TNL-498

Fix sorting issue

MA-199 Course Authorization framework in mobile API

Fix for ECOM-876

Need to add new XBlocks to the ADVANCED_COMPONENTS list

Use "Studio" name by default (instead of "edX Studio")

Test pagination reposition test is failing on release
and master. It was flaky test and this problem was
caused by the javascript animation. Issue was fixed by
adding the promise that we check the value of window
top after the animation is completed.

Awais786/course info api

remove unused variable

ECOM-248 Course Info API. Basic functionality implemented.

ECOM-248 adding factory for about descriptor and test cases for course info api

ECOM-248 adding test cases for couse info api.

ECOM-248 re-factoring code. updating test cases.

Tests for course_about data module

ECOM-248 Adding test cases for the exceptions.

ECOM-248 re-factoring code. fixing quality issues.

ECOM-248 fixing test cases and moved parse video method into utils.

added github username in authors

ECOM-248 removed merging issue of test_data

ECOM-248 removed unused files

 Test pagination reposition test is failing

Change tests so they show failures better.

Test pagination reposition test is failing on release
and master. It was flaky test and this problem was
caused by the javascript animation. Issue was fixed by
adding the promise that we check the value of window
top after the animation is completed.

TNL-952

Clean up front page UI and video elements, remove cruft [OPEN-407, OPEN-358]

Upgrade: Font Awesome 4.2.0 - Take #2

Remove Jobs, News
Change "Vision" to "About"