#21 Testing.  I just changed of a comment in a generated source file
Merge branch '21_update_OSS_Source' of
https://github.com/xtuml/editor.git into 21_update_OSS_Source

Conflicts:
	src/com.mentor.nucleus.bp.core/src/com/mentor/nucleus/bp/core/Activity_c.java
#201 test a code change