Merge branch 'dev_ema' into 'master'

Ema group contributions to the simulation

See merge request !39
1 job for master in 55 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Linux
failed #1542733
MasterJobLinux

00:00:55

 
Name Stage Failure
failed
MasterJobLinux Linux
[ERROR] Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:3.8.0.2131:sonar (default-cli) on project simulation: Not authorized. Please check the properties sonar.login and sonar.password. -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException
Cleaning up file based variables
ERROR: Job failed: exit code 1