7.0 change public holiday

Add country and states
Resubmit of https://code.launchpad.net/~initos.com/openerp-hr/7.0-change-public-holiday/+merge/224610
Indentation incorrect