[CHORES] Merging conflicts

administration/templates/detail_verif.html

administration/templates/verif.html

administration/tests.py

administration/urls.py

administration/views.py

app/models.py

app/templates/dashboard.html

app/templates/file_text.html

app/templates/file_video.html

app/templates/profile.html

app/templates/unggah.html

app/tests.py

app/urls.py

app/views.py

authentication/tests.py

authentication/urls.py

authentication/views.py