sync 20140721 to gitlab
Merge branch '20140721' of https://github.com/NetEaseWD/NEJ.git into 20140721