ddd
Merge remote-tracking branch 'origin/master'

Conflicts:
	Test/src/cn/test/bean/User.java