Fixed a lot of bugs!
Merge branch 'master' of https://github.com/redmoses/pos-app-project.git