example
Merge commit '0794f057feb48ba3956dac9a56a0c22a385aed23' into chrre/ma

Conflicts:
	SDMLib.net/src/org/sdmlib/serialization/json/SimpleGrammar.java
Merge commit '6c8ea322a6d3c7a7b2871296dbfa3d0bec864469' into chrre/ma

Conflicts:
	SDMLib.net/guisrc/org/sdmlib/javafx/SDMObservableList.java
	SDMLib.net/src/org/sdmlib/serialization/Entity.java
	SDMLib.net/src/org/sdmlib/serialization/EntityUtil.java
	SDMLib.net/src/org/sdmlib/serialization/json/JsonArray.java
	SDMLib.net/src/org/sdmlib/serialization/xml/XMLEntity.java
	SDMLib.net/src/org/sdmlib/storyboards/StoryboardManager.java
...
fixed launching java process on mac
Merge branch 'chrre/ma'

Conflicts:
	SDMLib.net/.settings/org.eclipse.jdt.core.prefs
	SDMLib.net/doc/FlipbookTimeLine.html
	SDMLib.net/doc/SDMLibProjectTimeLine.html
	SDMLib.net/doc/Sprint.001.BootingTimeLine.html
	SDMLib.net/doc/StudyRightObjectStoryboardsTimeLine.html
	SDMLib.net/examplehelpers/org/sdmlib/examples/studyright/creators/AssignmentSet.java
	SDMLib.net/examplehelpers/org/sdmlib/examples/studyright/creators/ProfessorSet.java
	SDMLib.net/examplehelpers/org/sdmlib/examples/studyright/creators/RoomSet.java
	SDMLib.net/examplehelpers/org/sdmlib/examples/studyright/creators/StudentSet.java
	SDMLib.net/examplehelpers/org/sdmlib/examples/studyright/creators/TopicSet.java
	SDMLib.net/examplehelpers/org/sdmlib/examples/studyright/creators/UniversitySet.java
	SDMLib.net/examplehelpers/org/sdmlib/examples/studyrightextends/creators/LectureSet.java
	SDMLib.net/examplehelpers/org/sdmlib/examples/studyrightextends/creators/ProfessorSet.java
	SDMLib.net/examplehelpers/org/sdmlib/examples/studyrightextends/creators/RoomSet.java
	SDMLib.net/examplehelpers/org/sdmlib/examples/studyrightextends/creators/StudentSet.java
	SDMLib.net/examplehelpers/org/sdmlib/examples/studyrightextends/creators/UniversitySet.java
	SDMLib.net/examples/org/sdmlib/examples/m2m/creators/GraphComponentSet.java
	SDMLib.net/examples/org/sdmlib/examples/m2m/creators/GraphSet.java
	SDMLib.net/examples/org/sdmlib/examples/m2m/creators/PersonSet.java
	SDMLib.net/examples/org/sdmlib/examples/m2m/creators/RelationSet.java
	SDMLib.net/examples/org/sdmlib/examples/studyright/StudyRightModel.java
	SDMLib.net/examples/org/sdmlib/examples/studyrightWithAssignments/StoryboardTests.java
	SDMLib.net/replicationsrc/org/sdmlib/replication/SharedSpace.java
	SDMLib.net/src/org/sdmlib/models/classes/ClassModel.java
	SDMLib.net/src/org/sdmlib/models/classes/Clazz.java
	SDMLib.net/src/org/sdmlib/models/pattern/OptionalSubPattern.java
	SDMLib.net/src/org/sdmlib/models/pattern/Pattern.java
	SDMLib.net/src/org/sdmlib/models/pattern/PatternLink.java
	SDMLib.net/src/org/sdmlib/models/pattern/PatternObject.java
	SDMLib.net/src/org/sdmlib/models/transformations/Template.java
	SDMLib.net/src/org/sdmlib/serialization/CharacterBuffer.java
	SDMLib.net/src/org/sdmlib/serialization/StringTokener.java
	SDMLib.net/src/org/sdmlib/serialization/Tokener.java
	SDMLib.net/src/org/sdmlib/serialization/gui/grid/GridGUITable.java
	SDMLib.net/src/org/sdmlib/serialization/gui/grid/ValueGrid.java
	SDMLib.net/src/org/sdmlib/serialization/json/JsonObject.java
	SDMLib.net/src/org/sdmlib/serialization/logic/CompareTo.java
	SDMLib.net/src/org/sdmlib/serialization/logic/ValuesMap.java
	SDMLib.net/src/org/sdmlib/serialization/logic/ValuesSimple.java
	SDMLib.net/src/org/sdmlib/storyboards/Storyboard.java
	SDMLib.net/srchelpers/org/sdmlib/models/objects/creators/GenericAttributeSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/objects/creators/GenericGraphSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/objects/creators/GenericLinkSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/objects/creators/GenericObjectSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/AttributeConstraintSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/CardinalityConstraintSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/CloneOpSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/DestroyObjectElemSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/GenericConstraintCreator.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/GenericConstraintPO.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/GenericConstraintSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/LinkConstraintSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/MatchIsomorphicConstraintSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/MatchOtherThenSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/NegativeApplicationConditionSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/OptionalSubPatternSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/PatternElementSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/PatternLinkSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/PatternObjectSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/PatternSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/ReachabilityGraphSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/ReachableStateSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/RuleApplicationSet.java
	SDMLib.net/srchelpers/org/sdmlib/models/pattern/creators/UnifyGraphsOpSet.java
	SDMLib.net/test/de/kassel/roombook/Floor.java
	SDMLib.net/test/de/kassel/roombook/creators/BuildingSet.java
	SDMLib.net/test/de/kassel/roombook/creators/CreatorCreator.java
	SDMLib.net/test/de/kassel/roombook/creators/FloorCreator.java
	SDMLib.net/test/de/kassel/roombook/creators/FloorPO.java
	SDMLib.net/test/de/kassel/roombook/creators/FloorSet.java
	SDMLib.net/test/org/sdmlib/models/objects/GenericObjectsTest.java
	SDMLib.net/test/org/sdmlib/models/patterns/PatternModelCodeGen.java