Reactivated Services and App payments
Merge branch 'master' into develop