Merge branch 'dev' of https://github.com/trip5/ehRadio into dev

Author: trip5

data/www/timezones.json

@@ -136,7 +136,7 @@
 "America/Indiana/Vincennes":"EST5EDT,M3.2.0,M11.1.0",
 "America/Indiana/Winamac":"EST5EDT,M3.2.0,M11.1.0",
 "America/Indianapolis":"EST5EDT,M3.2.0,M11.1.0",
-"America/Inuvik":"MST7MDT,M3.2.0,M11.1.0",
+"America/Inuvik":"CST6",
 "America/Iqaluit":"EST5EDT,M3.2.0,M11.1.0",
 "America/Jamaica":"EST5",
 "America/Jujuy":"<-03>3",
@@ -533,8 +533,8 @@
 "Etc/GMT-2":"<+02>-2",
 "Etc/GMT-1":"<+01>-1",
 "Etc/GMT+0":"GMT0",
-"Etc/GMT0":"GMT0",
 "Etc/GMT-0":"GMT0",
+"Etc/GMT0":"GMT0",
 "Etc/GMT+1":"<-01>1",
 "Etc/GMT+2":"<-02>2",
 "Etc/GMT+3":"<-03>3",