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
Installation -> OCAWAI
t pusMerge branch 'master' of github.com:GL-MPRI-2014/GL_MPRI_2014
Add tests of generation and logic in target check
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014
changed Types.mli
Add id in player
Added units of manual to config units.json
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014
Add id in player
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014
Repaired min/max range
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014
New OP AI & multiple fixes
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014
Add id in ClientPlayer
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014
Changed font not to use Roboto (Google)