CRM-12463, formRule js fixes
Merge pull request #632 from kurund/CRM-12463-fixes

CRM-12463, formRule js fixes
fix formatting and add comments
Added the Services_Twilio PEAR-compatible library. See CRM-12399 for more information.

----------------------------------------
* CRM-12399: Integrate official Twilio PHP library with org.civicrm.sms.twilio
  http://issues.civicrm.org/jira/browse/CRM-12399
Load the api_type string value in getProviderInfo. Fixed a typo bug in the Clickatell and Twilio files.
Merge pull request #633 from dlobo/FormattingFixes

fix formatting and add comments
Merge pull request #635 from pratik-joshi/CRM-12357-upgrade-part

CRM-12357 upgrade part
Merge pull request #631 from yashodha/soft

CRM-12463
more work on CRM-12463, fixed api for backward compatibility
Merge pull request #636 from kurund/CRM-12463-fixes

more work on CRM-12463, fixed api for backward compatibility
CRM-12490
CRM-12515: improving the credit card type in contribution forms.
Merge pull request #637 from deepak-srivastava/mastro

CRM-12490
Merge pull request #613 from Stoob/master

These are my web test enhancements for soft credit multiples
CRM-12515: better credit card handling in contribution forms.
CRM-12515: add China Union Pay
Remove social network block from Main.tpl and modify help text on configure title and settings page.
Merge pull request #640 from davecivicrm/CRM-12505

Remove social network block from Main.tpl and modify help text on config...
Merge credit card icons into one sprint file, and use the term 'icon' instead of 'logo'.
CRM-12522