[merge] SWGEmu unsstable branch 02AUG14
[merge] with SWGEMu unstable 03AUG14
[merge] swgemu unstable branch 04AUG14
[fixed] NPC lair spawn
Revert "[merge] with SWGEMu unstable 03AUG14"

This reverts commit 8c7286b5aa7a36e379182ad7d325bfbdcffdcea3.
Revert "[merge] SWGEmu unsstable branch 02AUG14"

This reverts commit 522d8929c10176279172953a44f1ce1021dbc982.
Revert "[fixed] broken Jedi trainer convo templates"

This reverts commit 14020628e55145d7de85ce2edbdbd376ab7fc56e.
Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development

Conflicts:
	scripts/ai/interrupts.lua
	scripts/object/creature/player/twilek_female.lua
	scripts/object/creature/player/twilek_male.lua
Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development
[merge] SWGEmu unstable branch 07AUG14