Merge branch 'modelica'

...elica/src/main/java/org/jmodelica/common/GUIDManager.java

...lica/src/main/java/org/jmodelica/common/LogContainer.java

...ca/src/main/java/org/jmodelica/common/ResourceLoader.java

...elica/src/main/java/org/jmodelica/common/URIResolver.java

.../java/org/jmodelica/common/ast/prefixes/EquationType.java

.../jmodelica/common/ast/prefixes/TypePrefixInputOutput.java

...ava/org/jmodelica/common/ast/prefixes/VisibilityType.java

...va/org/jmodelica/common/ccodegen/CFuncParamDirection.java

...ava/org/jmodelica/common/evaluation/ExternalFunction.java

...org/jmodelica/common/evaluation/ExternalProcessCache.java

...jmodelica/common/evaluation/ExternalProcessCacheImpl.java

...modelica/common/evaluation/ExternalProcessMultiCache.java

.../org/jmodelica/common/evaluation/ProcessCommunicator.java

...main/java/org/jmodelica/common/options/BooleanOption.java

...ca/src/main/java/org/jmodelica/common/options/Option.java

...ain/java/org/jmodelica/common/options/OptionRegistry.java

...rc/main/java/org/jmodelica/common/options/RealOption.java

.../main/java/org/jmodelica/common/options/StringOption.java

...c/main/java/org/jmodelica/common/options/TestOptions.java

...ca/src/main/java/org/jmodelica/junit/JModelicaRunner.java