----------------------------------------
* CRM-12923: Create HTML prototype of "Job Position" UI
  http://issues.civicrm.org/jira/browse/CRM-12923

----------------------------------------
* CRM-12923: Create HTML prototype of "Job Position" UI
  http://issues.civicrm.org/jira/browse/CRM-12923

CRM-12985 fix

----------------------------------------
* CRM-12985: do not update price field name when label is updated
  http://issues.civicrm.org/jira/browse/CRM-12985

CRM-13024 fixes

----------------------------------------
* CRM-13024: Search Builder dropdowns broken for Groups, State, Country ...
  http://issues.civicrm.org/jira/browse/CRM-13024

CRM-12924, CRM-12940 pluging advanced search panes via queryObjects hook

-- CRM-12914 made email addresses clickable in profile search results

----------------------------------------
* CRM-12924: Implement "Job" search (for "Advanced Search")
  http://issues.civicrm.org/jira/browse/CRM-12924
* CRM-12940: Allow extensions to participate in CRM_*_BAO_Query
  http://issues.civicrm.org/jira/browse/CRM-12940

Conflicts:
	CRM/Contact/BAO/Contact.php
	CRM/Group/Page/AJAX.php
	CRM/Report/Form/Member/Detail.php
	CRM/Utils/SoapServer.php
	CRM/Utils/System/Base.php
	sql/civicrm_generated.mysql
	tests/phpunit/CRM/Core/DAOTest.php
	tests/phpunit/CiviTest/CiviUnitTestCase.php
	tests/phpunit/api/v3/ContributionTest.php
	xml/version.xml

CRM-10859 rename BAO classes that dont follow naming std (at least those...

CRM-12940

CRM-10859 rename BAO classes that dont follow naming std (at least those for which API tests exist :-)

----------------------------------------
* CRM-12859: Manage Volunteer Assignments
  http://issues.civicrm.org/jira/browse/CRM-12859

more fixes for barcode layout CRM-12967

code cleanup and also added 'Save and Preview' option CRM-12965

added QR code support for name badges, CRM-12967

Restore comparison operators for search builder selects

CRM-13040 allow for possiblility geocoder sets postcode

fix - save petition

patched Pratik's work on barcode position fixes, CRM-12967

----------------------------------------
* CRM-12940: Allow extensions to participate in CRM_*_BAO_Query
  http://issues.civicrm.org/jira/browse/CRM-12940

removed unwanted hook

added hook_civicrm_alterBarcode which allows users to change the data en...

----------------------------------------
* CRM-12914: Make email addresses clickable in search results
  http://issues.civicrm.org/jira/browse/CRM-12914

CRM-12965

----------------------------------------
* CRM-12940: Allow extensions to participate in CRM_*_BAO_Query
  http://issues.civicrm.org/jira/browse/CRM-12940

CRM_Utils_Migrate_Export - Allow export of specific UFGroups