fix the import error
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of git://github.com/tianwalker2012/handpa
Merge branch 'master' of git://github.com/tianwalker2012/handpa
Merge branch 'master' of git://github.com/tianwalker2012/handpa
Merge branch 'master' of git://github.com/tianwalker2012/handpa
Merge branch 'master' of git://github.com/tianwalker2012/handpa
fix conflict