Merge branch 'master' of github.com:KotieSmit/openpos