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
Merge pull request #173 from bobsilverberg/update_browserid_0.10.1

Bug 1007337 - Update OneAndDone to use django-browserid 0.10.1
Bug 1054031 - Update feedback text to include mention of profile email preference
Merge pull request #175 from bobsilverberg/feedback_text

Bug 1054031 - Update feedback text to include mention of profile email preference
Fix problem where a task attempt was trying to be retrieved for a non logged-in user
Merge pull request #172 from bobsilverberg/fix-feedback

Fix problem where a task attempt was trying to be retrieved for a non logged-in user
Bug 1032312 - Switch order of buttons on task detail page
Bug 1030976 - Add ability to prioritize task
Add Travis-CI
Merge pull request #174 from glogiotatidis/travis

Travis-CI
Add compiled.txt
Merge pull request #178 from glogiotatidis/travis-2

Add compiled.txt
Merge pull request #176 from bobsilverberg/priority

Bug 1030976 - Add ability to prioritize task
Bug 1032694 - Elements misaligned on new task creation page
Getting started on Task Attempts Dashboard

Update css to allow for a wider content area when needed
Change feedback.attempt to one-to-one
Add migration to convert feedback.attempt to one-to-one

Activity Search form is working perfectly!
Fix formatting of filter and listing
Fix date range filter to work with empty fields
Styling of activity info

Conflicts:
	oneanddone/base/static/css/one-and-done.less

Implemented showing and hiding activity detail
started sorting stuff