Hotfix/2014 09 29

update password reset template (TNL-503)

Enable analytics dashboard link in instructor dashboard.

Hotfix annotations

Annotation Tools: Fixes issue - Thumbnail check breaks tool on creation

 - Fixed second similar function.

Conflicts:
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js

fixes for status for prof ed and verified registration

Image Annotation Tool: Fixes _isOpenSeaDragon function

Revert "Revert "add an additional tag so we can route zendesk tickets be...

Allow students to send username and email to third parties (TNL-405).

Update version of edx-oauth2-provider

allow username and email can be passed to a lti third party app
ask user permission when lti button is clicked
allow course editor to customize text on lti launch button

Revert "add an additional tag so we can route zendesk tickets better for...

Hide deleted course updates from mobile API.

Fix to allow usernames with '-', '+', '.' in Mobile API urls.

change registration code email and attachments, per product requirements

Properly Setting ANALYTICS_DASHBOARD_NAME for AWS

remove extra lines

conditionalize address line 2

add an additional tag so we can route zendesk tickets better for white l...

per product, allow for zero percentage coupons

Add the 'meta' column from the UserProfile table to the CSV download

Revert #3747

This reverts commit 1955aade36675289bdbc01554b6f74242754a746.

Update translations (autogenerated message)

Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt

add tests

fix

use org