Merge remote-tracking branch 'upstream/master' into new_dump1090

image/interfaces

@@ -12,3 +12,24 @@ allow-hotplug wlan0
 iface wlan0 inet static
   address 192.168.10.1
   netmask 255.255.255.0
+
+##
+##   Second Wifi Dongle for local work and internet access
+##     wifi mist be open for these settings to work
+##
+## uncomment the next two lines to activate the service as well as modify the settings and comments below
+#allow-hotplug wlan1
+#iface wlan1 inet static
+
+# The SSID you want to connect to
+# uncomment the next line and modify if necessary
+#  wireless-essid 6719
+# The address you want to use on your network
+# uncomment the next line and modify if necessary
+#  address 192.168.1.50
+# The address of your netmask
+# uncomment the next line and modify if necessary
+#  netmask 255.255.255.0
+# The gateway of your router that you are connecting to
+# uncomment the next line and modify
+#  gateway 192.168.1.1

web/plates/settings.html

@@ -70,7 +70,7 @@
 					<label class="control-label col-xs-5">Watch List</label>
 					<form name="watchForm" ng-submit="updatewatchlist()" novalidate>
 						<!-- type="number" not supported except on mobile -->
-						<input class="col-xs-7" type="string" required ng-model="WatchList" placeholder="space-delimeted identifiers" ng-blur="updatewatchlist()" />
+						<input class="col-xs-7" type="string" required ng-model="WatchList" placeholder="space-delimited identifiers" ng-blur="updatewatchlist()" />
 					</form>
 				</div>
 				<div class="form-group reset-flow">