changed by luojing
changed by real james
Merge branch 'luojing'

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

Conflicts:
	src/util/MD5.java