Fixeup menu order a little

Change-Id: Ibd7cc61c03f85d624d7640ef64d1021b36bc469c
Merge branch 'release/3.1.0' into develop
Merge branch 'release/3.1.0' into develop
Merge branch 'release/3.1.0' into develop
Added capability to specify default REST port in cytoscape3.props.  Fixes #2175

Change-Id: Ic77b7097c82f6e36daf6d2b3e786bd734a012ac1
Merge branch 'release/3.1.0' into develop
References #2303: Equations that reference local attributes can now be read successfully from sessions
Font-Style tests have been disabled because it is system-rependent.
Add renamed File->Export->Network to File->Export->Network and View and
create a new File->Export->Network that implements
ExportNetworkTaskFacotry.  Refs #1873

Change-Id: If1f6166dac0ec7f43677c87f98367d7a12e8fe4e
Merge branch 'release/3.1.0' into develop