lijinxin 2014/11/25
Merge branch 'dev' of github.com:VectorWinner/takeaway into dev