Bug 976576 - [DSDS][SIM Manager] Change the title text for "Data" CTA
  Change the description
  from "Internet connection, MMS, A-GPS and Marketplace payments will be sent from"
  to   "Data service network and Marketplace payments"
Merge branch 'master' of https://github.com/kombuta/gaia

Conflicts:
	apps/settings/elements/sim_manager.html
	apps/settings/locales/settings.en-US.properties