Add status tracking for cancellations
Track whether or not an upgrade is a gift
Merge branch 'feature/status-changes' into release/2014-09-03
Merge branch 'release/2014-09-03' into dev