CRM-13921 - Individual Prefix, Suffix and Gender fields are broken when used on tokens
Code comment cleanup
CRM-13970 - Add helper for getting page path
-- HR-212 modification to resolve notices
Merge pull request #2244 from dakshayani/hr-212

-- HR-212 modification to resolve notices
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-30-11-03-32
Added support for non-default MySQL host and port.

When I run tests over the MySQL RAM server, I'm usually running the MySQL RAM
server on a different port and I need this script in order to get that all
working in civicrm-project.
BAO_Contact - Fix use of  in static fn
Merge pull request #2173 from webpartners/master

CRM-13921 - Individual Prefix, Suffix and Gender fields are broken when used on tokens
Merge branch '4.4' of https://github.com/civicrm/civicrm-core

Conflicts:
	CRM/Core/BAO/Navigation.php
	xml/schema/Mailing/Event/Bounce.xml
Remove unused fn buildAddressBlock
Merge pull request #2279 from colemanw/optionForms

CRM-13970 - Add helper for getting page path
Remove functions that are never called
Merge pull request #2280 from colemanw/addShowHide

Remove functions that are never called
tests/phpunit - Fix for running with MySQL on alternative port
Merge pull request #2281 from totten/master-unittest-mysqlport

tests/phpunit - Fix for running with MySQL on alternative port
CRM-13929 - Move resource list out of .tpl file
CRM-13932 - Upgrade jQuery and add jQuery.migrate
CRM-13932 - Remove deprecated jQuery usage
CRM-13929 - Use minified js conditionally based on debug mode