update on 20140821
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/xiaozhu/testcase/WebIM/testReceive.java