Merge remote-tracking branch 'upstream/master'
Merge pull request #185 from Fingies/master

Added Distant Ship Controller, fixed some NPCs
Friends list - Fixed an issue with names apostrophes
Merge pull request #186 from Ziggeh/master

Friends list - names containing apostrophes
Updated Mos Eisley NPC Spawns

Added Additional NPCs, adjusted rotation of existing NPCs to proper
facing.
Removed Extra Life Day Tree from Wayfar

There was a second, unnecessary life day tree manually scripted in, when
one was spawned by buildout.
Temporary patch for ents
Added some NPCs to naboo
Merge pull request #189 from portocol/master

Added some NPCs to naboo
Added todo
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Merge branch 'master' of https://github.com/Fingies/NGECore2