My changes to merge
Merge branch 'dev' of https://github.com/ZoofaDesign/ibadgeshop into dev