2014-5-13办公室台式机增加xset说明
Merge remote-tracking branch 'origin'