CRM-12806
CRM-12806, error handling and functions
CRM-12807
Merge pull request #15 from ravishnair/CRM-12762sampleData

CRM-12762 handled for the remaining custom data & did some improvements
Merge pull request #16 from deepak-srivastava/hide

CRM-12807
Merge branch 'hr' of git://github.com/deepak-srivastava/civihr into deepak-srivastava-hr

Conflicts:
	hrui/hrui.php
-- CRM-12762 added city and postal code in address sample data