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

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --combined .gitmodules
index f4765c5ab5d55d1ae3218c3119ed246ee22d4678,f4a3831f40e757f86a163e333c3e257d8710bb45..39379e615498f676e1473f7554aa95403ddee988
--- 1/.gitmodules
--- 2/.gitmodules
+++ b/.gitmodules
@@@ -1,7 -1,8 +1,8 @@@
  [submodule "src/assets/configs-aws"]
        path = src/assets/configs-aws
 -      url = ../../sap-labs-france/ev-aws.git
 +      url = ../../E-Mobility/ev-aws.git
        branch = master
  [submodule "src/assets/configs-scp"]
        path = src/assets/configs-scp
 -      url = ../../sap-labs-france/ev-scp-config.git
 +      url = ../../E-Mobility/ev-scp-config.git
+        branch = master