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 pharo1.1_dev

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

Conflicts:
	repository/MonticelloFileTree-Core.package/monticello.meta/version