Merge branch 'master' into feature/177-create-applicant-dashboard

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

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

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

opentech/apply/funds/templates/funds/includes/feed-item.html

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

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

opentech/apply/users/models.py

opentech/static_src/src/images/speech-bubble-blue.svg

opentech/static_src/src/javascript/components/tabs.js

opentech/static_src/src/javascript/main.js

opentech/static_src/src/sass/apply/abstracts/_variables.scss

.../static_src/src/sass/apply/components/_activity-feed.scss