Merge branch 'master' of github.com:sap-labs-france/ev-simulator into master-enterprise