develop
Merge pull request #47 from kevinyby/develop

modify billapp