Add Gift message for code redemption
Update message with redeem instructions
Allow trial codes to be redeemed
Merge branch 'master' into dev