updated to v1.5
Merge branch 'master' into gemstone

* master:
  updated to v1.5

Conflicts:
	repository/ZTimestamp.package/monticello.meta/version