Jonathan Harris b28355d182 Merge EDSM-NET/master ...

Squashed commit of the following:

commit a13a5c431396a131aad21927f2b4cc43b948d417
Author: AnthorNet <anthor.net@gmail.com>
Date:   Sun Dec 17 16:51:58 2017 +0100

    Ready for testing

commit 3e5915075b20e824580e5c3d879bce467dcb8b8d
Author: AnthorNet <anthor.net@gmail.com>
Date:   Sat Dec 16 21:47:22 2017 +0100

    Fix message json encoding

commit 868030578422f9c8568d5ba21d6f3aa132c01232
Author: AnthorNet <anthor.net@gmail.com>
Date:   Sat Dec 16 17:54:10 2017 +0100

    Fix double Dict conversion

commit 7693031f6f09c7119c51f91abbed7241e5ad6a1c
Author: AnthorNet <anthor.net@gmail.com>
Date:   Sat Dec 16 17:31:19 2017 +0100

    Fix transient state format

commit 54c96e31774ba5bfa2d19ac45b07d355dbefe46b
Author: AnthorNet <anthor.net@gmail.com>
Date:   Sat Dec 16 17:25:02 2017 +0100

    Fix calling discarded event callback

commit 24d006947f3bbb6607f893042d783c9232402c28
Author: AnthorNet <anthor.net@gmail.com>
Date:   Fri Dec 15 15:11:28 2017 +0100

    Retry Discarded Event list if empty

commit 4defedba965489d2d0c009189a193f9ecabc84fd
Author: AnthorNet <anthor.net@gmail.com>
Date:   Fri Dec 15 14:43:28 2017 +0100

    Prepare API migration

2018-01-02 16:35:06 +00:00

..

eddb.py

Update eddb database

2017-10-17 00:21:35 +01:00

edsm.py

Merge EDSM-NET/master

2018-01-02 16:35:06 +00:00

inara.py

Only try login if output requested

2018-01-02 16:16:44 +00:00