move head of Master along [ci skip]
move head of Master along [ci skip]
Merge pull request #87 from mumez/ston_changes

Ston changes ... will fix the MCGitFileTree issues on the pharo2.0_dev branch  (cherry picked from commit f8e1f8c700657f275deaa463aad02ade0e7a2468)
pull request #87: in order to allow upgrades, we still have to write .json files ... at least until we've pushed 1.0.4 out with a reader that understands both...
(cherry picked from commit b28738f702b3b5978800485bd5562bda23a6c333)

Conflicts:

	repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/methodProperties.json
	repository/MonticelloFileTree-Core.package/monticello.meta/version
Merge branch 'master_dev'

Issue #90: allow for reading of .ston files for all platforms
Merge branch 'master' into pharo3.0_dev

- fix Issue #87: Ston changes
  https://github.com/dalehenrich/filetree/pull/87
  read .ston or .json files

Conflicts:
	repository/MonticelloFileTree-Core.package/MCFileTreeStCypressReader.class/methodProperties.json
	repository/MonticelloFileTree-Core.package/monticello.meta/version
Merge branch 'issue_90' into gemstone2.4

- fix Issue #90: provide option to create .ston property files
  https://github.com/dalehenrich/filetree/issues/90

Issue #90 fix
(cherry picked from commit 2d949d40153508da68aed8d58ce018a683485dea)

Conflicts:

	repository/MonticelloFileTree-Core.package/MCFileTreeAbstractStWriter.class/methodProperties.json
	repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/instance/writeRepositoryProperties.st
	repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/methodProperties.json
	repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/properties.json
	repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/instance/writeDefinitions..st
	repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/methodProperties.json
	repository/MonticelloFileTree-Core.package/monticello.meta/version
	repository/MonticelloFileTree-Tests.package/monticello.meta/version
Merge branch 'master' into pharo3.0_dev

- fix Issue #90: provide option to create .ston property files
  https://github.com/dalehenrich/filetree/issues/90

Conflicts:
	repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/methodProperties.json
	repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/properties.json
	repository/MonticelloFileTree-Core.package/MCFileTreeStCypressWriter.class/methodProperties.json
	repository/MonticelloFileTree-Core.package/MCFileTreeWriter.class/methodProperties.json
	repository/MonticelloFileTree-Core.package/monticello.meta/version
	repository/MonticelloFileTree-Tests.package/monticello.meta/version
bugfixes needed for Issue #90
Merge branch 'master' into pharo3.0_dev

bugfixes needed for Issue #90
Merge branch 'issue_91' into gemstone2.4
(cherry picked from commit 4a291b655b27a46ff5136676ea7c660d2eb09025)

- Issue #91: Cleaned up MCFileTreeRepository>>repositoryProperties and
  MCFileTreeRepository>>writeRepositoryProperties interaction.

  1. MCFileTreeRepository>>writeRepositoryProperties writes existing
     repositoryPropery dictionary and can be called at any time (like
     when a property is changed).
  2. MCFileTreeRepository>>repositoryProperties signals Error if the
     repository directory does not exist. If the .filetree file is not
     present, it is created with default repository properties.
  3. whenever MCFileTreeRepository>>directory: is called, the repository
     properties are reread from disk.

Conflicts:

	repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/instance/writeRepositoryProperties.st
	repository/MonticelloFileTree-Core.package/monticello.meta/version
	repository/MonticelloFileTree-Tests.package/monticello.meta/version
Merge branch 'master' into pharo3.0_dev

- Issue #91: Cleaned up MCFileTreeRepository>>repositoryProperties and
  MCFileTreeRepository>>writeRepositoryProperties interaction.

  1. MCFileTreeRepository>>writeRepositoryProperties writes existing
     repositoryPropery dictionary and can be called at any time (like
     when a property is changed).
  2. MCFileTreeRepository>>repositoryProperties signals Error if the
     repository directory does not exist. If the .filetree file is not
     present, it is created with default repository properties.
  3. whenever MCFileTreeRepository>>directory: is called, the repository
     properties are reread from disk.

Conflicts:
	repository/MonticelloFileTree-Core.package/MCFileTreeRepository.class/methodProperties.json
	repository/MonticelloFileTree-Tests.package/MCFileTreeGenericLoaderTest.class/instance/getTestRepositoriesDirectory.st
	repository/MonticelloFileTree-Tests.package/MCFileTreeGenericLoaderTest.class/methodProperties.json
updated from upstream
Minor updates