Smuggler - Added Overridable Protection
Revert "Smuggler - Added Overridable Protection"

This reverts commit b8903b82f705c94d4619eec4ebb215cc7f8e83ff.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fixed a bug with roadmap rewards
Roadmap - Added all Jedi rewards
Roadmap - Fixed an issue with ithorians and wookiees
Weapons - Fixed a problem with DPS calculation

It wasn't checking if the weapon actually had elemental damage.
Weapons - Fixed incorrect DPS calculation
Roadmap - Removed No Trade flag on some items
Roadmap - Added all Bounty Hunter rewards
Merge remote-tracking branch 'upstream/master'
Merge pull request #192 from Ziggeh/master

Roadmap reward quest items fix