Added check on county in code and db

Also added error message for duplicates
Merge branch 'qa' into prod