remove the local.xml from git
Merge branch 'master' of https://github.com/leijianbin/inkstatus
Merge branch 'master' of https://github.com/leijianbin/inkstatus