Merge remote-tracking branch 'origin/baless_m'
Merge branch 'master' of https://github.com/larpomatic/gnk
Merge branch 'master' into jaccou_n
merge
Merge remote-tracking branch 'origin/jaccou_n'
Merge remote-tracking branch 'origin/master' into jaccou_n
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/larpomatic/gnk into jaccou_n
Come back code delete