switch province to country
Merge branch 'f15' of https://github.com/healerkx/scada into f15