pull master, resolve conflict

.gitignore

assets/js/Login.jsx

assets/js/ProfilePage.jsx

assets/js/__test__/ProfilePage-test.jsx

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

assets/js/components/ApplyModal.jsx

assets/js/components/Vacancy.jsx

core/migrations/0014_student_self_description.py

core/migrations/0018_student_gender.py

core/migrations/0020_merge_20191006_1058.py

core/migrations/0020_merge_20191006_1743.py

core/migrations/0020_merge_20191006_2103.py

core/migrations/0020_merge_20191006_2225.py

core/migrations/0020_merge_20191010_2249.py

core/migrations/0020_student_expected_salary.py

core/migrations/0021_auto_20191006_1925.py

core/migrations/0021_merge_20191006_1217.py

core/migrations/0021_student_github_url.py

core/migrations/0022_merge_20191006_2154.py

core/migrations/0048_merge_20191011_1143.py