Merge branch 'reseaux' of git://github.com/GL-MPRI-2014/GL_MPRI_2014
Merge branch 'master' of git://github.com/GL-MPRI-2014/GL_MPRI_2014
Merge branch 'master' of git://github.com/GL-MPRI-2014/GL_MPRI_2014
Merge branch 'master' of git://github.com/GL-MPRI-2014/GL_MPRI_2014
Merge branch 'master' of git://github.com/GL-MPRI-2014/GL_MPRI_2014
Merge branch 'master' of git://github.com/GL-MPRI-2014/GL_MPRI_2014
Merge branch 'master' of git://github.com/GL-MPRI-2014/GL_MPRI_2014
 changed Makefile.in so it compiles network
add initialization methods/updates in dealer & Types
Merge branch 'master' of git://github.com/GL-MPRI-2014/GL_MPRI_2014