Fix bugs for generation
Merge branch 'master' of https://github.com/ProjetM1MPRI2013/central

Conflicts:
	code/src/generation/batiment.h
	code/src/generation/geography.cc
	code/src/generation/geography.h
	code/src/generation/tile.cc
	code/src/generation/tile.h
Merge branch 'master' of https://github.com/ProjetM1MPRI2013/central