Merge pull request #1 from AndrewHolder/master

Added AoR and Far Horizons Weapons
Add character import
updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	weapon_importer/EotE_Weapons.js
Fixed OR statement to only include 'undefined'