Merge branch 'master' into feature/48-172-status-lead-modal

opentech/apply/activity/forms.py

...ech/apply/activity/migrations/0003_activity_visibility.py

opentech/apply/activity/models.py

...pply/activity/templates/activity/include/action_list.html

...ply/activity/templates/activity/include/comment_form.html

...ply/activity/templates/activity/include/listing_base.html

...ly/dashboard/templates/dashboard/applicant_dashboard.html

opentech/apply/dashboard/views.py

opentech/apply/funds/models.py

opentech/apply/funds/tables.py

...y/funds/templates/funds/applicationsubmission_detail.html

...h/apply/funds/templates/funds/includes/activity-feed.html

...tech/apply/funds/templates/funds/includes/status_bar.html

opentech/apply/funds/templates/funds/submissions.html

opentech/apply/funds/views.py

opentech/apply/funds/workflow.py

opentech/apply/users/management/__init__.py

opentech/apply/users/management/commands/__init__.py

opentech/apply/users/management/commands/migrate_users.py

opentech/apply/users/migrations/0005_user_drupal_id.py