Stm4 is the update java transaction implementation
Merge remote-tracking branch 'origin/master'

Conflicts:
	Grained Lock/utils/Test.java