Adding functional loyalty points feature
Merge branch 'davidbranch'
merging loyalty changes back to master