Bug 1027332 - Expired tasks display 'Get Started' button
bug 1011729 Show list of easy tasks on front page
Merge pull request #132 from bobsilverberg/fix_get_started

Bug 1027332 - Expired tasks display 'Get Started' button
Minor tweak to deploy script
Bug 1006569 - [privacy] Add checkbox at sign-up
Merge branch 'UserProfileForm'
Address comments from @bobsilverberg
Update stackato.yml for email settings and switch to pip to address bug 1030284
Bug 1011688 - Update Task detail page
Merge pull request #133 from bobsilverberg/task_detail_2

Bug 1011688 - Update Task detail page
Merge pull request #138 from mjzffr/front-signed-out

bug 1011729 Show list of (easy) tasks on front page
Update stackato.yml to default to dev
Fix bug with profile updating
Bug 1019268 - [privacy] Existing users must sign the privacy policy
Merge pull request #140 from bitgeeky/ExistingUser

Bug 1019268 - [privacy] Existing users must sign the privacy policy
Bug 1020611 - Update Available tasks page with new filter
Merge pull request #134 from bobsilverberg/task_list_filter

Bug 1020611 - Update Available tasks page with new filter
Migration to fix data issue with task teams on staging
Migration to fix data issue with task teams on staging
Merge branch 'master' of github.com:mozilla/oneanddone

Conflicts:
	oneanddone/tasks/migrations/0011_fix_task_teams.py