NPC config merger fixing (not done)
Template context menu for toolbars
Context menu params
GUI calibrating
Merge pull request #49 from Wohlstand/master

Merge to Update 49