--HR-306 Add custom data to Absence Type
Merge pull request #480 from PoonamNalawade/HR-306

--HR-306 Add custom data to Absence Type
fixes for HR-306
Merge pull request #485 from yashodha/1.2

fixes for HR-306
Merge pull request #489 from civicrm/1.2

Merge branch 1.2 into master