pull from master and merge (accept changes from master)

.DS_Store

assets/js/CompanyProfile.jsx

assets/js/ProfilePage.jsx

assets/js/SupervisorPage.jsx

assets/js/__test__/CompanyProfile-test.jsx

assets/js/__test__/ProfilePage-test.jsx

assets/js/__test__/components/CompanyRegisterModal-test.jsx

assets/js/components/ApplicationList.jsx

assets/js/components/CompanyRegisterModal.jsx

core/admin.py

core/lib/validators.py

core/migrations/0014_auto_20191004_1340.py

core/migrations/0014_company_category.py

core/migrations/0014_feedback.py

core/migrations/0014_student_linkedin_url.py

core/migrations/0014_student_region.py

core/migrations/0015_merge_20191005_1926.py

core/migrations/0015_merge_20191005_1957.py

core/migrations/0015_merge_20191005_2038.py

core/migrations/0016_merge_20191005_2235.py