Score + echange score etc
Merge branch 'KENTIN'

Conflicts:
	src/config/images.js
	src/controllers/set_generators.js
	src/main.js
	src/models/kamikaze.js
	src/models/player.js
fy