Merge Final Fix.
Merge Module Assembly - Payment Preference APIs

Conflicts:
        apiary.apib
        initializers/helper.js
        routes.js