Add payment term to user props
add expiration event
add recurring flag
add expiration to membership payment event
add expiration to membership payment event
Merge branch 'refs/heads/master' into dev