Merge branch 'liang_new'

Conflicts:
bin/FingerSinger.apk
bin/classes.dex
bin/jarlist.cache
src/com/game/fingersinger/DrawLines.java