may have changes
conflict resolved
changes in language
Merge branch 'master' of https://github.com/emocentmagar/hdnpl into mitav
Merge pull request #54 from emocentmagar/mitav

Mitav