Update .travis-ci.sh
Merge branch 'master' into engine_dev
FieldGenerator est maintenant un objet contenant la map et les armees initiales
Merge branch 'engine_dev' of https://github.com/GL-MPRI-2014/GL_MPRI_2014 into engine_dev