Merge
Merge branches 'beling_a' and 'master' of https://github.com/larpomatic/gnk into beling_a
Merge branch 'master' of https://github.com/larpomatic/gnk into beling_a
Correct parser with generic_resources
Merge branches 'beling_a' and 'master' of https://github.com/larpomatic/gnk into beling_a
Merge remote-tracking branch 'origin/master'