Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-03-14-48-25

Conflicts:
	CRM/Contribute/BAO/Contribution.php
	tests/phpunit/api/v3/GroupContactTest.php
Test cleanup
CRM-14165 - Add metadata-based quickform select
--HR-235 Modification for showing column header label on Map field page
-- Code modification
--HR-235 rowDisplayCount tweak
Merge pull request #2460 from NileemaJadhav/HR-235

--HR-235 Modification for showing column header label on Map field page
CRM-13970 - Remove redundant option group page/form
CRM-14165 - Add client-side options editor and add to activity form
Merge pull request #2465 from colemanw/select

Select
CRM-13970 - Fix upgrade script
CRM-14170 - Close help dialog when clicked twice
Merge pull request #2469 from colemanw/master

CRM-14170 - Close help dialog when clicked twice
CRM-14170 - BugFix for closing help dialog when clicked rapidly
get of grouping filter
Merge pull request #2473 from yashodha/HR-252.fix

get rid of grouping filter
CRM-13833 fix
Merge pull request #2474 from jitendrapurohit/CRM-13833

CRM-13833 fix
Make CiviCRM look better
Merge pull request #2477 from colemanw/css

Improve css