[merge] swgemu unstable branch 21DEC14
{merge] untracked files missed in previous merge
[fixed[ files not changed in merge
]fixed] overwritten tarkin entries
[fixed] tarkin mobiles reversion
[changed] custom Tarkin BS NOC to world spawner
[changed] city manager to support cities on adventure worlds

[chnaged[ corellian park types to work on all adventure planets
[changed] increased SWB NBZ to 2200m radius
[moved] NGE house loot to its own folder

[moved] mando schemes to their own folder
[added] NS rare loot group to FS NPCs types (NS, SMC, DJM/K, BH marks,
Sentinels, Misc force NPCs
[added] sith/jedi house schems to nightsister_rare loot group
[fixed] missing close brace
[increased] weighting of black sun dynamic spawns on yavin 4
[added] admin term to jedi house
[fixed] some more brace/comma lua garbage
[fixed] even more lua comma/brace BS
]merge] merge swgemu unstable branch 22DEC14
[remove[ Nyax spawns form Corellia world spawner

[added] Lifeday 2014 vendor & convo handlers to coronet
[restored] travelling painter convo handler
[added] copy of planet_manager for Tarkin live
[added] copy of character_builder for Tarkin live
[fixed] path for new location of GCW faction perks
[remove] test versions of config files
[add] live versions
[fixed] set shuttleport away timer to 60 seconds