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
Commencement du serveur de récuperation des connections

Actuellement lorsqu'un client permet sa connection, il
pert le jeu. Pour permet au joueur de recuperer leur
partie, un serveur va etre mis en place. Le client devra
alors envoyer une genre de cle permettant de l'identifier
puis, si cette cle est valide, la socket du client sera
echangee.
-eq -> =, now it should try 4.02.1
fix because players ids not from 1 to n
Now better movement in Home
Fix #106, normal behavior in Home.screen
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014
Merge branch 'master' of github.com:GL-MPRI-2014/GL_MPRI_2014
Coded fundals of fight, with affine function to easily parametrize the balancing we talked about in issue#99
adapt Fieldgenerator to take a player.t list as argument instead of nbplayers, also, unit id and p_id are ints not strings
Fix issues in CliPlayer and netPlayer

Commit done with Julien Grange.
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014
Fix issue in cliPlayer.ml
Creation  of dummy players
Merge branch 'generation' of https://github.com/GL-MPRI-2014/GL_MPRI_2014
Added fundals of fight
With affine function on attack to parametrize from the engine