contact us issue resolved, activation code issue resolved
Merge remote-tracking branch 'origin/master'