[Added] Filled in empty herald templates

Change-Id: Ia108b3fe22671ddebb96a07eee850225af3a57ee
[Fixed] Filled out missing npc templates

Change-Id: Ib437ae515e07121995516e144518b4ecbd12aed8
Merge "[Added] Filled in empty herald templates" into unstable
Merge "[Fixed] Filled out missing npc templates" into unstable