Add some things
fix merge issues
add triggers in DB and modify student DashBoard
fix merge conflits
Add lasts modifs