Merge branch 'master' into engine-development

Conflicts:
	org.modeldriven.fuml/.gitignore

Author: seidewitz

README.md

@@ -72,7 +72,7 @@ To build using Eclipse:
 ###Testing
 
 1. In a Windows/DOS command window, navigate to the 'root' reference
-implementation directory. This directory is where the Apache Ant 'build.xml'
+implementation directory. This directory is where the Apache Maven 'pom.xml'
 file can be found.
 
 2. Use the following command:
@@ -93,7 +93,7 @@ Testing individual JUnit tests in Eclipse:
 ###Deploying
 
 1. In a Windows/DOS command window, navigate to the 'root' reference
-implementation directory. This directory is where the Apache Ant 'build.xml' 
+implementation directory. This directory is where the Apache Maven 'pom.xml' 
 file can be found.
 
 2. Use the following command:
@@ -110,14 +110,14 @@ drive's root directory. The deployment directory will be called:
 DEPLOYED implementation. The implementation can only be run from a DEPLOYED
 binary or source distribution (see above).
 
-2. To load a UML model file (XMI 2.1 format) and execute one or more behaviors
+2. To load a UML model file (XMI 2.1 or 2.4.1 format) and execute one or more behaviors
 (activities), use the following command:
 
         fuml <model-file> [<behavior-name> <behavior-name> <behavior-name> <...>]
 
    Where:
 
-   * `<model-file>` is UML model file (XMI 2.1 format)
+   * `<model-file>` is UML model file (XMI 2.1 or 2.4.1 format)
 
    * `<behavior-name>` is a named behavior within the model-file
 

org.modeldriven.fuml/.gitignore

@@ -2,3 +2,4 @@
 /target/
 /fuml.log
 /fuml.log.*
+/fuml.log.*