Merge branch 'release/3.6.0' into support/3.x

* release/3.6.0:
  Updated dependencies for 3.6.0
  Fixed state machine diagram name in Tom Sawyer integration.
  Updated version info for 3.6.0

build.gradle

@@ -131,7 +131,7 @@ dependencies {
     // Other dependencies we're unable to resolve via standard repositories
 
     if (buildAccess == 'internal') {
-        preCompile group: 'gov.nasa.jpl.cae.magicdraw', name: 'cae-magicdraw-core', version: '3.5.3', ext: 'zip'
+        preCompile group: 'gov.nasa.jpl.cae.magicdraw', name: 'cae-magicdraw-core', version: '3.6.0', ext: 'zip'
     }
     else {
         preCompile group: 'com.nomagic', name: 'magicdraw', version: '185sp3', classifier: 'MagicDraw_185_sp3_no_install', ext: 'zip'

gradle.properties

@@ -1,4 +1,4 @@
-version=3.5.3
+version=3.6.0
 group=org.openmbee.magicdraw.mdk
 descriptorFile=MDR_Plugin_Model_Development_Kit_91110_descriptor.xml
 magicdDrawGroupName=gov.nasa.jpl.cae.magicdraw.mdk

src/main/java/gov/nasa/jpl/mbee/mdk/model/TomSawyerDiagram.java

@@ -78,7 +78,7 @@ public void setCollectRelatedElements(boolean collectRelatedElements) {
     public enum DiagramType {
         BLOCK_DEFINITION("Block Definition Diagram", "BDD"),
         INTERNAL_BLOCK("Internal Block Diagram", "IBD"),
-        STATE_MACHINE("State Machine", "STM"),
+        STATE_MACHINE("State Machine Diagram", "STM"),
         ACTIVITY("Activity Diagram", "ACT"),
         SEQUENCE("Sequence Diagram", "SD"),
         PACKAGE("Package Diagram", "PKG"),