Bug 808618. Pick Contact Activity cross icon in header
Configure the prod payment provider (bug 824841)

This also removes the mock payment provider
that was in use only for testing.
Bug 826585 - [email/activesync] Deleting/moving messages causes them to show up twice in the target folder; r=asuth, a=blocking-basecamp
Merge pull request #7344 from mozsquib/email-as-move

Bug 826585 - [email/activesync] Deleting/moving messages causes them to show up twice in the target folder
Merge pull request #7343 from kumar303/payment-cfg-824841

Configure the prod payment provider (bug 824841)
Bug 818216 - [Sounds] Sounds Unlock
Bug 823515 - Notification Time Stamp Too Low
Bug 800016 - Updated volume overlay icons to latest design.
Bug 806963 - [Notifications] Different Icon Sizes used for 'System Update Available' and 'Downloading System Update' and the app is not to spec.
Merge pull request #7295 from jmcanterafonseca/fix_activity_layout

Bug 808618. Pick Contact Activity cross icon in header
Bug 826216 if carrier is not defined for a phone number undefined is shown
[Bug 822630] [contacts] Possible CSP problems
Bug 817169 - When homescreen loads it can jerk the user around [r=vingtetun]
Bug 823370 - [FTU] Hit Import SIM contacts multiple time will create duplicate contacts
Bug 826888 - Using load event instead localized when opening a Dialer activity r=arcturus
Bug 822931 - Maps app asks you to bookmark to the homescreen erroneously
Bug 805192 - Remove mozilla preset
Bug 824597 - Close the pair view when users press the home button while pairing
Bug 820145 - Update icons

Changes the edit icon into a edit mode type of icon.
Adds a compose icon as the old edit icon.
Adds an edit contact icon.
Bug 827137 - Cost control running with foreground priority when not visible (again)