added Player-NPC interaction

also changed where NPC colours are rendered
Re-enabled teleportation and added a portal
Merge branch 'aside'
Merge branch 'aside'