correction passage contexte des arcs
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/webapp/js/scenes/hero-selection-scene.js
Merge remote-tracking branch 'origin/master'