DIRTY: choice merge fix

why ?
Merge branch 'master' of github.com:Heigvd/Wegas

# By Francois-Xavier Aeberhard
# Via Francois-Xavier Aeberhard
* 'master' of github.com:Heigvd/Wegas:
  fix add result in js