Log encore...
Merge branch 'master' of github.com:SimonMiaou/SysDisServeur-EJB.git