CRM-12806
CRM-12806, error handling and functions
Merge branch 'hr' of git://github.com/deepak-srivastava/civihr into deepak-srivastava-hr

Conflicts:
	hrui/hrui.php