王潇然 2013.08.12
Merge remote-tracking branch 'origin'