-- HR-130 added extra field to Funding
-- HR-130 Code improvement
HR-181 -  Move Funding to its own screen
removed the code related to genral tab
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