Merge pull request #30 from filelife/master

后端更新 ：2014-8-11 16:26:46
Merge pull request #2 from Seins/master

后端同步：2014-8-11 16:28:43