Merge pull request #27 from Fiyery/server

Server
Merge and buf fix
GUI recherche
Merge remote-tracking branch 'origin/master' into server