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