Merge after pull

diff --cc README.md
index 6608231596ec5fcada4810b8b68b9720c860c07b,32b821964e354c6cff2f65a30c89435beb9a019a..90bbcee2672d8f7d6ec4f5b964a3cdb353f00b00
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -5,57 -5,3 +5,55 @@@ Publications, slides and manuals for [T
  
  
  [![Build Status](https://travis-ci.org/Parisson/Telemeta-doc.svg?branch=dev)](https://travis-ci.org/Parisson/Telemeta-doc)
- 
 +
- 
 +* Conférences
 +
 +** FMA 2014
 +"An open web audio platform for ethnomusicological sound archives management and automatic analysis"
 +Thomas Fillon, Guillaume Pellerin, Paul Brossier and Joséphine Simonnot
 +in the proceeding of the 4th International Workshop on Folk Music Analysis,  June 12-13, 2014, Istanbul, Turkey.
 +
 +** EcoAcoustics 2014
 +"Telemeta, an open and collaborative web audio platform for digital sound archives
 +management"
 +Guillaume Pellerin, Thomas Fillon
 +presented at the Ecology and acoustics meeting : emergent properties from community to landscape
 +16-18 Jun 2014 Paris (France).
 +
 +** DLFM 2014
 +"Telemeta: An open-source web framework for ethnomusicological audio archives management and automatic analysis"      
 +Thomas Fillon, Joséphine Simonnot, Marie-France Mifune, Stéphanie Khoury, Guillaume Pellerin, Estelle Amy de La Bretèque, David Doukhan, Dominique Fourer, Jean-Luc Rouas, Julien Pinquier, Claude Barras
 +The 1st International Digital Libraries for Musicology workshop (DLfM 2014)
 +
 +* Demonstration
 +*** Demonstration at CMMR 2013 - Marseilles
 +"TELEMETA, audio web Content Management System for ethnomusicological sound archives",
 +Thomas Fillon, Guillaume Pellerin, Paul Brossier et Joséphine Simonnot,
 +In Proc. of the 10th International Symposium on Computer Music Multidisciplinary Research, Marseille, France, October 15-18, 2013
 +
 +*** AES 2014 - London
 +"Telemeta: Open Web Audio Platform for Sound Archives in the Use Case of Ethnomusicology"
 +Thomas Fillon, Guillaume Pellerin, Paul Brossier et Joséphine Simonnot,
 +Presented at the Audio Engineering Society 53rd conference on Semantic Audio
 +London, UK, January 27-29, 2014
 +
 +* Communication
 +
 +** Digital Music Lab 2014
 +"Telemeta, Open Web Audio Content Management System"
 +Guillaume Pellerin
 +Presented at Digital Music Lab 1st Workshop on Analysing Big Music Data, 19 March 2014, London, UK
 +
 +** SoundSoftware 2014
 +"TimeSide, An open web audio processing framework"
 +Guillaume Pellerin , Thomas Fillon and Paul Brossier1
 +presented at SoundSoftware 2014: Third Workshop on Software and Data for Audio and Music Research, July 8, 2014, London, UK
 +
 +** GIS SPADON (Groupement d'Interêt Scientifique sur les Supports Pérennes d'Archivage des DOnnées Numériques)
 +Présentation du projet Telemeta lors du Conseil scientifique du 24 septembre 2014
 +
 +** Journées des ressources numériques IRCAM, Paris 
 +Presenté lors de la 2ème rencontre sur les bases de données et les ressources numériques : la visualisation des données numériques, 26 septembre 2014, Paris, France
 +
 +"Analyse et édition collaboratives des données multimedia" - Guillaume Pellerin
 +