Merge branch 'dev' of https://github.com/TugaMarafado/loyalty into dev
Merge branch 'dev' of https://github.com/TugaMarafado/loyalty into dev