Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development
Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development
[merge] SWGEmu unstable branch 11AUG14
[fix] missed template in merge
[Added] Raavi Or'Zeth (an artist)
Merge branch 'Development' of github.com:kinshi/tarkin_scripts into Development

Conflicts:
	scripts/mobile/conversations.lua
	scripts/mobile/quest/serverobjects.lua