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
Merge pull request #2 from electusmatari/master

update from upstream