ca marchait pas !
Merge remote-tracking branch 'upstream/master'
fr/en, story friends
correction destruction editeur
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/var.js
Merge branch 'master' of github.com:Tytan/application
Merge pull request #31 from Tytan/master

bug doigt, visuel
Merge branch 'master' of github.com:La-separation/application

Conflicts:
	res/story/stories.js