changed by james
changed by luojing
Revert "changed by james"

This reverts commit ab65882e1fdacb55df42346490aadc4167ae2e59.
master changed
Merge branch 'luojing'

Conflicts:
	src/util/MD5.java
Merge branch 'james'

Conflicts:
	src/util/MD5.java