BLD-564.

Improvement and update for ImageInput

re-remove ora message as part of merge conflict resolution

E0d/release merge

Update version of django-staticfiles

loc mapper memoize

Add ignore patterns for staticfiles to avoid processing symlink dirs

STUD-1048

Hotfix/2013 12 12

Add sysadmin dashboard

Fix typo in peer grading messages.

Revert "Studio HTTPS fonts"

This reverts commit 540256b2, reversing
changes made to bd04ab5a.

For seeing overview of system status, for deleting and loading
courses, for seeing log of git imports of courseware.  Includes command
for importing course XML from git repositories.

Added a lot of tests for additional coverage with some minor fixes
those tests discovered

Remove protocol from font URLs in Studio and Tiny MCE

Fix data dash acceptance test to wait for text

whitespace-only changes

STUD-1039

Conflicts:
	cms/djangoapps/auth/authz.py

Create explicit Locations.

Create explicit Locations.

Fix auth email configuration

Fix bug introduced by #1919: usage of not-yet-defined AUTH_TOKENS dict.

Return the full name of the student as part of the OpenId response.

added anonymous id template info to html component

STUD-1017

LMS-750

Cache anonymous user id on the user object, so that queries aren't made many times over during module rendering

Cache anonymous user id on the user object, so that queries aren't made many times over during module rendering

added glossary to index