resolved conflict
Merge branch 'packaged' of https://github.com/supradeus/nln-live into packaged