joknm

lopl
Merge branch 'master' of https://github.com/chenshipeng/eliuyan

Conflicts:

ELiuYan12/ELiuYan.xcodeproj/project.xcworkspace/xcshareddata/ELiuYan.xcc
heckout