luojiang 20140930
Merge branch 'master' of https://github.com/linghp/ZLFAsist.git