fix notices
formatting fixes
Merge branch 'MiscFixes' of github.com:dlobo/civicrm-core into dlobo-MiscFixes

Conflicts:
	CRM/Core/BAO/File.php