Merge pull request #11 from ScotSalmon/master

Fixes for EFT fit support in shop
Merge pull request #12 from ScotSalmon/master

emauth: use corp instead of alliance contacts for allies
Merge pull request #13 from ScotSalmon/master

emauth: characters can be allies too
settings: update contact email
industry: incorporate Crius manufacturing line tax

Crius expansion adds non-trivial costs for manufacturing lines. We need
to include these as it makes a big difference for certain items.
Merge pull request #3 from electusmatari/master

merge from upstream
Merge pull request #15 from ScotSalmon/master

merge industry changes to support Crius
industry: forgot to import json
industry: typo fix
industry: groundwork for further Crius updates

These changes are not advisable without also updating the SDE, and
more investigation is needed to make sure the code will work right
with new handling of ME, wastage, damage per job, and extra materials
in the new SDE. This commit is not ready to be pushed live yet.

Also we need to make sure the Crius SDE won't break anything else.