Specially modified by Nino for previewing Hyperion patch.
Merge branch 'master' of https://github.com/tw-shpark/Pyfa

Conflicts:
	eos/effects/systemcapacitortransferamount.py
	staticdata/eve.db