Merge branch 'master' of https://www.github.com/MalcolmRobb/dump1090 into web_update
B"H Merge branch 'master' of https://www.github.com/MalcolmRobb/dump1090 into web_update

Conflicts:
	public_html/script.js
B"H remove stray plus
B"H remove stray <<<
Merge branch 'web_update'
Merge branch 'master' into since