Add character import
updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	weapon_importer/EotE_Weapons.js