Merge pull request #47 from Unicaen-DNR2i/dev

Dev
fixed link logout and home of nav back
modif
fixed conflit
modif merge
fixed conflit
fixed error merge
Merge branch 'master' into dev