fixed conflicts

fixed conflicts
fixed conflict

fixed conflict
Merge branch 'master' of https://github.com/mnizinski79/Network-Packaging-Partners
added atts to npp plugins for title field

added atts to npp plugins for title field