Merge branch 'develop'
more interfaces for paytable scanner
Merge branch 'master' into develop