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

Conflicts:
	Publications/Conferences/2014_FMA/poster/poster_FMA2014.tex

diff --cc Publications/Conferences/2014_FMA/poster/poster_FMA2014.tex
index c955ad112a46edf78f30be5355d50f0de072d7ec,1a3f59a8dfba83f7c91ffa296f3fb21444749489..b2e4bd3ea3cd9a37dba64418a4bde805afe31bdc
--- 1/Publications/Conferences/2014_FMA/poster/poster_FMA2014.tex
--- 2/Publications/Conferences/2014_FMA/poster/poster_FMA2014.tex
+++ b/Publications/Conferences/2014_FMA/poster/poster_FMA2014.tex
@@@ -216,12 -216,11 +216,11 @@@
              \item Approximately 3700 hours of material published (more than
                5000 discs, many of which are very rare).
              \end{itemize}
-             Usage of the archives:
-             \begin{itemize}
-             \item Research
-             \item Teaching (lessons, academic works, exams)
-             \item Museology
-             \end{itemize}
+             
+             The platform allows researchers to publish the ressources they have collected together with they research work. It also allows to exchange data online with other researchers or communities producing their music in their home countries through collaborative tools like markers and comments.
+             
 -Telemeta is also used as a support for teachers in anthropology or ethnomusicology as it provides the students an access to ressources for lessons, academic works and exams.
 -            
++            Telemeta is also used as a support for teachers in anthropology or ethnomusicology as it provides the students an access to ressources for lessons, academic works and exams.
++
            %\end{column}
            %\begin{column}{0.7\linewidth}
              %\centering
@@@ -340,23 -340,20 +339,18 @@@
    \end{block}
  
    \begin{block}{Ongoing developments}
-     \begin{columns}
-       \begin{column}{0.47\linewidth}
-         Regarding Telemeta, the main goal is to turn it into a fully operational platform with a modern web interface for:
-         \begin{itemize}
-         \item \alert{Annotating} multimedia items
-         \item Efficiently \alert{visualizing} results from analysis from various data types together with X-Y zoom capability and audio synchronization
-         \end{itemize}
-       \end{column}
-       \begin{column}{0.47\linewidth}
+ \vspace{-1cm}
+     \begin{multicols}{2}[]
 -      The main goal is to turn Telemeta into a fully operational platform with a modern web interface for:
          \begin{itemize}
-         \item Designing, managing and running analysis on large audio corpus and serializing the results through a REST web API with a TimeSide server
-         \item Increasing the analysis functionality with various automatic analysis and annotation tools for speech, audio, Music Information Retrieval and ethnomusicology (DIADEMS project).
+         \item \alert{Annotate} multimedia items by time segments supporting both free annotations and ontology-based annotations
+         \item Efficiently \alert{visualize} results from analysis from various data types together with X-Y zoom capability and audio synchronization
 -        
 -        \item Provide TimeSide with a RESTful web API to design, manage and run
 -          analysis on large audio corpus and serialize results
++        \item Design, manage and run analysis on large audio corpus and serialize the results through a REST web API with the TimeSide server
+         \item Increase the analysis functionality with various automatic analysis and annotation tools for speech, audio, Music Information Retrieval and ethnomusicology (DIADEMS project).
++
  \end{itemize}
-       \end{column}
-     \end{columns}
-     
-   \end{block}
+ \end{multicols}
+ \end{block}
+ 
  \begin{block}{Références}\tiny
  \bibliographystyle{plain}
  %\label{sec:ref}