Fixed docs conflict but needs checking. Merge branch 'develop' into feature/redeem-codes
Fixed docs conflict but needs checking.
Merge branch 'develop' into feature/redeem-codes

Conflicts:
	docs/PromoPuffin_Documentation_API.md

westerncapelabs/promopuffin-core