CRM-12264 - Set branch names in distmaker.conf
fix notices
formatting fixes
minor bug found during execution of WebTest_Contact_AddTest::testHouseholdAdd test case (failing locally with the same error shown on server)
-- fixed for CRM-12233
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
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
CRM-12258 Default processor appears first in radio button set. Set default processor as default for payment_processor radio button event registration form.

----------------------------------------
* CRM-12258: Default payment processor should appear first in Payment Method radio button for online contribution page and online event registration
  http://issues.civicrm.org/jira/browse/CRM-12258
Merge pull request #299 from davecivicrm/CRM-12258

CRM-12258 Default processor appears first in radio button set. Set defau...
Merge pull request #302 from totten/releaser-fixes

CRM-12264 - Set branch names in distmaker.conf
-- webtest fix(type was not writing anything inside tinymce as it does not work for tinymce 3.4.x+ versions as per some posts in stackoverflow.so, I applied the suggested fix.)