core and tests packages load: 82 run, 61 passes, 0 expected failures, 5 failures, 16 errors, 0 unexpected passes
Merge branch 'master' into gemstone

Conflicts:
	repository/Ston-Tests.package/monticello.meta/version
move Dictionary code to AbstractDictionary for GemStone: 86 run, 65 passes, 0 expected failures, 5 failures, 16 errors, 0 unexpected passes
checkpoint: 86 run, 74 passes, 0 expected failures, 10 failures, 2 errors, 0 unexpected passes
checkpoint: 86 run, 74 passes, 0 expected failures, 12 failures, 0 errors, 0 unexpected passes
tests are green: 86 run, 86 passes, 0 expected failures, 0 failures, 0 errors, 0 unexpected passes
Merge branch 'master' into gemstone

Conflicts:
	repository/Ston-Core.package/AbstractDictionary.extension/class/fromSton..st
	repository/Ston-Core.package/AbstractDictionary.extension/instance/stonOn..st
	repository/Ston-Core.package/Collection.extension/instance/stonOn..st
	repository/Ston-Core.package/Date.extension/class/fromSton..st
	repository/Ston-Core.package/DateAndTime.extension/instance/stonOn..st
	repository/Ston-Core.package/Object.extension/instance/fromSton..st
	repository/Ston-Core.package/Object.extension/instance/stonOn..st
	repository/Ston-Core.package/STON.class/properties.json
	repository/Ston-Core.package/STONListWriter.class/properties.json
	repository/Ston-Core.package/STONMapWriter.class/properties.json
	repository/Ston-Core.package/STONReader.class/properties.json
	repository/Ston-Core.package/STONReaderError.class/properties.json
	repository/Ston-Core.package/STONReference.class/properties.json
	repository/Ston-Core.package/STONShortListWriter.class/properties.json
	repository/Ston-Core.package/STONStreamWriter.class/properties.json
	repository/Ston-Core.package/STONWriter.class/instance/encodeCharacter..st
	repository/Ston-Core.package/STONWriter.class/instance/encodeList..st
	repository/Ston-Core.package/STONWriter.class/instance/isSimpleSymbol..st
	repository/Ston-Core.package/STONWriter.class/instance/listElementSeparator.st
	repository/Ston-Core.package/STONWriter.class/instance/mapElementSeparator.st
	repository/Ston-Core.package/STONWriter.class/instance/on..st
	repository/Ston-Core.package/STONWriter.class/instance/shortListElementSeparator.st
	repository/Ston-Core.package/STONWriter.class/instance/writeFloat..st
	repository/Ston-Core.package/STONWriter.class/properties.json
	repository/Ston-Core.package/STONWriterError.class/properties.json
	repository/Ston-Core.package/TimeStamp.extension/class/fromSton..st
	repository/Ston-Tests.package/STONReaderTests.class/instance/testByteArray.st
	repository/Ston-Tests.package/STONReaderTests.class/instance/testJsonString.st
	repository/Ston-Tests.package/STONReaderTests.class/instance/testString.st
	repository/Ston-Tests.package/STONReaderTests.class/instance/testTime.st
	repository/Ston-Tests.package/STONReaderTests.class/properties.json
	repository/Ston-Tests.package/STONTestDomainObject.class/instance/^equals.st
	repository/Ston-Tests.package/STONTestDomainObject.class/properties.json
	repository/Ston-Tests.package/STONTestUser.class/properties.json
	repository/Ston-Tests.package/STONTestUser2.class/properties.json
	repository/Ston-Tests.package/STONTests.class/properties.json
	repository/Ston-Tests.package/STONWritePrettyPrinterReadTests.class/properties.json
	repository/Ston-Tests.package/STONWriteReadTests.class/instance/testDatesAndTimes.st
	repository/Ston-Tests.package/STONWriteReadTests.class/properties.json
	repository/Ston-Tests.package/STONWriterTests.class/instance/testDoubleQuotedString.st
	repository/Ston-Tests.package/STONWriterTests.class/instance/testReferenceSharingError.st
	repository/Ston-Tests.package/STONWriterTests.class/instance/testString.st
	repository/Ston-Tests.package/STONWriterTests.class/instance/testTime.st
	repository/Ston-Tests.package/STONWriterTests.class/properties.json
Merge branch 'common' into gemstone

Conflicts:
	repository/Ston-Core.package/STONWriter.class/instance/encodeCharacter..st
	repository/Ston-Core.package/STONWriter.class/instance/writeFloat..st
fix STONReader>>lookupClass:
[cherry-picked from SHA: bbe57785667d972d5cb51dbf39f6d6034506af71] fix STONReader>>lookupClass:

Conflicts:

	repository/Ston-Core.package/monticello.meta/version
Merge branch 'common' into gemstone

Conflicts:
	repository/Ston-Core.package/monticello.meta/version
Merge branch 'master' into common

Conflicts:
	repository/Ston-Core.package/monticello.meta/version
	repository/Ston-Tests.package/STONTestDomainObject.class/class/dummy.st
Merge branch 'master' into common

Conflicts:
	repository/Ston-Core.package/monticello.meta/version
Merge branch 'common' into gemstone

Conflicts:
	repository/Ston-Core.package/Date.extension/class/fromSton..st
	repository/Ston-Core.package/DateAndTime.extension/instance/stonOn..st
	repository/Ston-Core.package/TimeStamp.extension/class/fromSton..st
	repository/Ston-Core.package/monticello.meta/version
	repository/Ston-Tests.package/monticello.meta/version
refresh using new version of FileTree with method timestamps
create baseline and travis-ci artifacts
Merge branch 'issue_1' into pharo
Merge branch 'master' into common

Conflicts:
	.travis.yml
	repository/Ston-Core.package/monticello.meta/version
scarf README and license from configuration branch
Merge branch 'common' into gemstone: no tests or validation done...yet

Conflicts:
	repository/Ston-Tests.package/monticello.meta/version