Pep8 should ignore pycharm-helpers files on folks' workstations/VMs.

Add remember me checkbox back to the combined login/registration page

Add bok-choy shards 4 and 5. New default is 'shard 6'

Don't delete *.pyc files in the .git directory

Index course information alongside courseware

If you have a branch named "remove-all-.pyc", the original code would
clobber it inside the .git directory, because branches become files with
the same name.  This prevents find from looking in .git, saving your
precious oddly named branches.

Add discussion topic API

will fall in 'shard 6'

Release (DO NOT MERGE)

Conflicts:
	cms/djangoapps/contentstore/tests/test_courseware_index.py

This is the first stage of the new Discussion API.

JIRA: MA-604

Update translations (autogenerated message)

aria-describedby has broken IDref on Sign in email form

Add missing __init__.py files

update version of flaky to 2.0.3

ECOM-1284  enabling re-generate certs.

Set explicit git commit hash for django-settings-context-processor

AC-97

add location_id field for the Reverification XBlock in VerificationStatu...

do garbage collection when dumping memory

Update pytz to 2015.2

pytz changed their versioning scheme from using letters to using
numbers. The old scheme is screwing up new versions of pip.

Correct "shure" to "sure" in a comment

Correct spelling in a comment

add script for generating commands needed for hotfix

Update copy on reverification flow.