Merge branch 'KENTIN'

Conflicts:
	src/config/images.js
Reglage équi
Merge branch 'KENTIN' of https://github.com/nanarchrist/ExplodingDragons_GW2014 into KENTIN

Conflicts:
	src/config/images.js
sounds
fix bug limits
Merge branch 'LloydV3'

Conflicts:
	src/config/images.js
Final GD Test
dark dragon
Merge branch 'KENTIN'

Conflicts:
	src/config/images.js
	src/controllers/set_generators.js