Smarty - Export $crmPermissions object for use in all templates
CRM-12578 - Remove extras.css
CRM-13617 - fix linking state province and country in multi-value custom fields
Code review for schedule reminders
-- CRM-13617 Webtest modification

----------------------------------------
* CRM-13617: Link Country and state province widget for custom data
  http://issues.civicrm.org/jira/browse/CRM-13617
CRM-10225 fix - New Price Set Error

http://issues.civicrm.org/jira/browse/CRM-10225
CRM-10025:Price Set Error
CRM-10225 fix
CRM-10225 indentation fix
Merge remote branch 'upstream/master'