Merge remote-tracking branch 'origin/Adrien'

Conflicts:
app/Controllers/App_controller.php
app/Views/main.html
config/routes.ini

Quelques bugs