Eluna: Fix merge conflicts, Fix possible crash on startup, Update version hash
Merge pull request #239 from Rochet2/Rel20

Eluna: Fix merge conflicts, Fix possible crash on startup, Update version hash