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
New folder for AI
Merge branch 'master' into script_dev

Conflicts:
	Makefile.in
Merge branch 'master' into script_dev

Conflicts:
	Makefile.in
Merge branch 'master' into script_dev

Conflicts:
	src/engine/Game_engine.ml
	src/engine/Game_engine.mli
Merge branch 'master' into script_dev

Conflicts:
	Makefile.in
Merge branch 'master' into script_dev & AST type

Conflicts:
	Makefile.in
Merging master
Base for menhir parser
Minimal parser implementation (/!\ not tested)
Added optional parenthesis
Bugfixes & first script example
Removed the ugly two boffer implementation.
Merge branch 'master' of github.com:GL-MPRI-2014/GL_MPRI_2014
engine and interface settings. Move everything to common/config/
global config possibility