This is a direct conflict.
Merge branch 'master' of https://github.com/DallasMarketCenter/buyreg.kiosk.git