added humen_merc call CLASS_MERC now, as it was class stormtrooper before, now it has its own faction name
and will go in convasations to, need to be tested to see if that works as i didnt see them begin talk yet,
as im not sure if this has been done totaly right, was a request from darthfutuza
added merc convacations in to the folder wher they are located, need to upload that to when it is
Merge branch 'master' of http://github.com/eezstreet/JediKnightGalaxies
Fixed some better Ai combat for npc, they getting in to close combat now to
also jedi dosn't not walk in cyrkle on til you attack them, they will turnt you down and use some powers somtimes
fixed Force Lightning on turrets
mess a bit around wiht coverpoints, not totaly sure it make a deffrint
//Stoiss
Merge pull request #11 from Stoiss/master

fixed