-- HR-130 added extra field to Funding
-- HR-130 Code improvement
-- HR-179 Hide Communication Preferences
-- HR-180 Remove "Time Period" sub-heading
HR-181 -  Move Funding to its own screen
removed the code related to genral tab
-- HR-177 Emergency Contact Type - Please remove all values other than "Emergency Contact Is"
-- HR-196 Change field name "Reference Supplied" to "Reference Supplied By"
HR-183 replaced textbox with dropdown for department
Add upgrade from 1.0 to 1.1 for new pay_currency field
remove department fields from xml
Merge branch 'HR-130' of git://github.com/dakshayani/civihr into dakshayani-HR-130
HR-130, HR-181 - Resolve conflicts

Merge branch 'HR-181' of git://github.com/vivekarora/civihr into dakshayani-HR-130

Conflicts:
	hrjob/templates/CRM/HRJob/Underscore/hrjob-general-summary-template.tpl
	hrjob/templates/CRM/HRJob/Underscore/hrjob-general-template.tpl
changed format for title and contract type display
-- HR-190  Add custom field to HR's data model but disable by default
Merge pull request #174 from yashodha/HR-192

changed format for title and contract type display
Merge pull request #163 from NileemaJadhav/HR-179

-- HR-179 Hide Communication Preferences
Corrected the name of column
Merge pull request #164 from NileemaJadhav/HR-180

-- HR-180 Remove "Time Period" sub-heading
-- #hr-130 handled upgrade for org_id