Merge remote-tracking branch 'upstream/master'
Jedi - Fixed Force Throw and Spark
Merge remote-tracking branch 'upstream/master'
Cleaned up calculateArmorProtection in the Equipment Service a bit
Revert "Cleaned up calculateArmorProtection in the Equipment Service a bit"

This reverts commit 62166f0929b8e29ca78472244c0bb135dd957108.
Removed check preventing new skillMods showing
Changed cooldowns to correctly use a float
Minor cooldown fix
Change holoemote cooldown to seconds
Fixed armour calculation bug when wearing a Jedi robe
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
some AI fixes
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
fixed #388
Buffs refactored to use DatatableVisitor on server load

Originally, everytime a new Buff instance was created, it would loop
through the Datatable Visitor everytime. Now it's only done once on
server startup and put into a buffMap. A copy of the base buff is then
done through the constructor of Buff class should a new instance of that
buff type needs to be created from the one inside the map.
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
Changed buff for Elder Jedi Oppressor Robe
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2
fixed action/health regen bug
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2