formatting fixes
Merge pull request #587 from dlobo/FormattingFixes

formatting fixes
Merge pull request #602 from yashodha/CRM-12463

more BAO work(CRM-12463)
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-01-11-04-54

Conflicts:
	sql/civicrm_generated.mysql
clean up (CRM-12463)
cleanup (CRM-12463)