fix
Merge branch 'develop' of http://github.com/point-of-sales/pos-project into develop
update baocao