Consolidate payment method code
Change online payment action phrase
Tweaked account page for basket
Moved SMS live
Merge branch 'develop'