Add class for Country and Currency
Merge branch 'master' of //DEVSVR02/Git/MatrakomHr