Add some optional policies around password resets, such as password reuse, forced password resets, allowed frequency of password resets
password history: just limit the result set range to simplify iteration logic
remove double icons in the wiki sidebar
switching more wiki icons to use the right format
Upgrade django_nose to 1.2
BLD-958: Force video player in flash mode.
Merge pull request #3195 from edx/anton/force-flash

Force video player in flash mode.
Merge pull request #3204 from edx/db/upgrade-django-nose

Upgrade django_nose to 1.2
Fix the pointer to the contentstore in the bok-choy settings
Added "Edit in CMS" links throughout courseware
Merge pull request #3184 from edx/frances/fix/lms-wiki-icons

Remove double icons on LMS wiki page
Merge pull request #2552 from edx/giulio/edit-in-cms-links

Add "View in Studio" links throughout LMS
Stray space made html file formatting incorrect
Merge pull request #2781 from edx/cdodge/password-history-enforcements

Add some optional policies around password resets, such as password reus...
Merge pull request #3223 from edx/ahodges/documentation/spacing

Stray space made html file formatting incorrect
Updates to ORA2 documentation
AN-836: draft info about spreadsheets and UTF8, illustrations
Merge pull request #3221 from edx/ahodges/documentation/excel

AN-836: draft info about spreadsheets and UTF8, illustrations
Merge pull request #3226 from edx/sylvia/documentation/DOC-269

Updates to ORA2 documentation
Move overview drag and drop code to a utility class.