Merge branch '1506688802-02' into 'master'

assets/js/ProfilePage.jsx

core/migrations/0020_merge_20191006_1444.py

core/migrations/0021_student_website_url.py

core/migrations/0040_merge_20191010_1031.py

core/migrations/0041_merge_20191010_1155.py

core/models/accounts.py

core/serializers/accounts.py

core/tests/test_accounts.py