working version
new inventory by jk
Merge branch 'develop' of https://github.com/jiangkuo888/ORP_beta into develop
pull again
Merge branch 'develop' of https://github.com/jiangkuo888/ORP_beta into develop
new inventory and phone UI
 merge conflict