Merge pull request #16 from ProjectSWGCore/master

Fork update
Merge pull request #17 from ProjectSWGCore/master

Fork update
Junk Loot, the rest of it.

Correct templates for all junk loot. Removed npc_loot folder (not
needed).
Merge pull request #870 from zingzing175/master

Junk Loot, the rest of it.
Added NPC's to corellia

Added Junkdealers
Added Profession counselor to cnet
Added City ODB to gitignore
Moved GCW officer collection scripts

Moved the scripts to the collections directory
Added more NPC's to Tatooine

Added Remaining Junkdealers to mos espa
Added Toggi Bok
Fixed #872

Fixed missions not being displayed in the mission terminal listing
sometimes.
Fixed wrong locations being displayed for missions.
forgot to delete debug line from prior commit
Merge pull request #873 from tacef/master

Added NPC's to corellia
Merge pull request #17 from ProjectSWGCore/master

pull
Colored junk naming convention
small template fix for RE attachments
Added structure report, treasury report and manage militia to city management terminal
Added revoke citizenship
Making a treasury deposit will now inform the mayor of the depositor name and amount by mail.
More Work on White Thranta Bunker

Added Brok Ziam
Added Durr Rodak
Merge pull request #874 from zingzing175/master

Junk loot color naming and small template fix for Re ing.
Correct poweup templates

http://www.projectswg.com/showthread.php?t=32203
https://www.youtube.com/watch?v=H2LqCrgmGoQ

templates according to these links. Good RE info shown in these also.