[remove] custom bazaar terminals from kaadara
Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development
[merge] from SWGEmu unstable branch 24OCT14
Revert "[merge] from SWGEmu unstable branch 24OCT14"

This reverts commit b264eef8b8f8c0fd1b508954da7215db9d5c7df1.
Revert "Revert "[merge] from SWGEmu unstable branch 24OCT14""

This reverts commit b4cd0e6c47ee93d0d66b531c02eb30c54b2697f5.
[merge] SWGEmu Unstable branch 27OCT14
[fixed] regression of Lok DE cave mobs
[fixed] regression of jawa POI mobs
[disable] ability check for player hospital placement
[Updated] Raavi Or'zeth (an Artist)
[Fixed] Stun resistance on Kashyyykian Ceremonial Left Bracer
Merge pull request #88 from stacy19201325/Development

[Updated] Raavi Or'zeth (an Artist)
[changed] cpl corsec mob types
Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development
[fixed] typo
[changed] some more corsec mob types
Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development
[revert]  Metals changes to factional NPCs - going back to stock SWGEmu values
Merge pull request #1 from kinshi/Development

Sync from master