CRM-12264 - Set branch names in distmaker.conf
fix notices
formatting fixes
-- webtest improvement
-- webtest improvement made based on the break on server
minor bug found during execution of WebTest_Contact_AddTest::testHouseholdAdd test case (failing locally with the same error shown on server)
-- webtest fix (due to changes made in CRM-12202)
CRM-12259 suppress Master Address Belongs To from list of fields
available to profiles

----------------------------------------
* CRM-12259: Bulk update with shared address fails
  http://issues.civicrm.org/jira/browse/CRM-12259
Merge pull request #293 from pratik-joshi/minor-api-bug-fix

minor bug found during execution of WebTest_Contact_AddTest::testHouseho...
Merge pull request #294 from pradpnayak/CRM-12233

-- fixed for CRM-12233
Merge pull request #295 from aydun/bu_shared_address

CRM-12259 suppress Master Address Belongs To from list of fields
Merge pull request #296 from ravishnair/webtest-fix/improvement

Webtest fix/improvement
CRM-12261
CRM-12254
Fix js strict error
Use 'on' method instead of deprecated 'live'
Code cleanup and js linting
Merge pull request #297 from dlobo/CRM-12254

CRM-12254
Merge branch 'MiscFixes' of github.com:dlobo/civicrm-core into dlobo-MiscFixes

Conflicts:
	CRM/Core/BAO/File.php
Remove advmultiselectResize from global scope