Merge pull request #26 from oisy/f15

F15 solve pull conflict
switch province to country
Merge branch 'f15' of https://github.com/healerkx/scada into f15
switch province to country
log
log
add new device data commit
Merge branch 'f15' of https://github.com/healerkx/scada into f15