version:20140727

version:20140727
Merge pull request #1 from wedsos/20140727

合并主干