Preparation for deployment
Merge branch 'staging' of https://github.com/va1erian/emu-dide into staging
Final adjustements