Add some types to Types
Résolution de conflits
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014

Conflicts:
	src/common/Types.mli
	src/network/dealer.ml
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014