Merge branch 'dev' of github.com:Parisson/Telemeta-doc into dev

Conflicts:
	Workshops/SoundSoftware_2014/TimeSide_SoundSoftware_2014_07.pdf

diff --cc Workshops/SoundSoftware_2014/TimeSide_SoundSoftware_2014_07.pdf
index 1d210e5e8c98c4a2d0adc0826624edb6e9cc4180,900827530665d3809dc8080d69c9a10978422e2f..1324ba46275853fc9d6ae0204f9fdfc2a601fb21
Binary files differ

diff --cc Workshops/SoundSoftware_2014/TimeSide_SoundSoftware_2014_07.tex
index 9be1f244dc98d0c67905634c1b7978ec341e18ad,9a9edf1e1ee0aa322267289330e371aac6199572..fbeff891496ed42b5d04c7040a5ac7a3ab4c842b
--- 1/Workshops/SoundSoftware_2014/TimeSide_SoundSoftware_2014_07.tex
--- 2/Workshops/SoundSoftware_2014/TimeSide_SoundSoftware_2014_07.tex
+++ b/Workshops/SoundSoftware_2014/TimeSide_SoundSoftware_2014_07.tex
@@@ -258,21 -258,18 +258,19 @@@
  
      \begin{block}{Usages}
          \begin{itemize}
--        \item Analyze large music audio datasets on demand over a robust and scalable platform
--        \item Share audio data and metadata with experts to make them collaborate in editing, processing and discovering
--        \item Build large statistical campaigns and vizualizations from ontologies, geographic data and sounds
--        \item Scale the audio data through the web (URL indexes)
++        \item Analyze and annotate large music audio datasets with a robust and flexible framework (plugin style architecture)
++        \item Export audio data and metadata with experts to make them collaborate for processing and annotating
++        \item Build large statistical campaigns and vizualizations from metadata and sounds
++        \item Scale the audio data through the web
++        \item Give a smart audio engine to your application
         \end{itemize}
      \end{block}
      
 -    \begin{block}<2>{Applications}
 +    \begin{block}<2>{Domains}
           \begin{itemize}
-             \item Musicology
-             \item Anthropology
-             \item Computer science
-             \item Museology
-             \item Biology
-             \item Ecology
 -            \item Realtime bioacoustical monitoring system over internet (needs hardware)
 -            \item Biodiversity studies
 -            \item Development and test of new species detection algorithms on large and historical datasets
++            \item Musicology, Anthropology, Museology
++            \item Computer science, Web development
++            \item Biology, Ecology
           \end{itemize}
      \end{block}
  }