Bug 1038618 - [testing] Test that one time tasks are marked completed on finishing
Merge pull request #164 from bitgeeky/UpdateAPI

Bug 1042213 - Update Task API to include attempts by users for a particu...
Merge pull request #163 from bitgeeky/SelectorChanges

Bug 1038618 - [testing] Test that one time tasks are marked completed on...
Bug 1018321 - Create url to one and done profile page based on username or name

Conflicts:
	oneanddone/users/tests/test_views.py
Remove get() from ProfileDetailsView and update tests
Address review comments
- fix i18n issue
- clean up use of billboard class
- use two views for profile vs myprofile
Address next round of review comments
- fix i18n issues
- make code more succinct
- account for MultipleObjectsReturned exception
- remove code that relies on `request.path`
Merge pull request #157 from bobsilverberg/public_profile

Bug 1018321 - Create url to one and done profile page based on username or name
Changed default task time to 30mins bug 1032354
Allow for multiple urls in BROWSERID_AUDIENCE

This is to support https://oneanddone.allizom.org in addition to https://oneanddone.paas.allizom.org
Merge pull request #169 from rbillings/estimatedtime

Changed default task time to 30mins bug 1032354
Bug 1048353 - One time tasks need expiration date

Add management command and model method to close expired onetime attempts
Merge pull request #167 from bobsilverberg/expire_one_time_tasks

Bug 1048353 - One time tasks need expiration date
Bug 1030996 - Add in tool notifications

- When a Task becomes unavailable (e.g., by expiring or being marked as a draft),
  find all attempts for the Task and mark them as requiring notification
- Using middleware, if an attempt for the current user is marked as `requires_notification`, display a modal message
  informing them that their open task was closed
Merge pull request #155 from bobsilverberg/notifications

Bug 1030996 - Add in tool notifications
Bug 1033475 - Allow user to configure email preferences from their profile

Update User Profile edit screen to allow email preference
Update text on account creation screen to indicate how to remove consent to email
Don't send email address in feedback email if they have not consented
Hide user email from most admin screens if they have not consented to receive email
Add consent_to_email field to UserProfile
Change OneAndDoneUserManager.get_query_set() to from select_related to prefetch_related due to https://code.djangoproject.com/ticket/15040

Should secure Auth - User admin to superusers only so that not everyone can see all the email addresses

Post review: Reduce length of very long string in SignUpForm
Merge pull request #171 from bobsilverberg/email_prefs

Bug 1033475 - Allow user to configure email preferences from their profile
Update django-browserid to v0.10.1 in vendor-local
Changes required to support django-browserid 0.10.1
Remove unused six.py from vendor-local