Merge remote-tracking branch 'origin/master' into tech/rewrite-file-validation

# Conflicts:
#	visualization/app/codeCharta/codeCharta.model.ts
#	visualization/app/codeCharta/codeCharta.service.ts