Merge in modifications
Merge bettermap
Fix all the things
Add flightradar24.com link
Merge commit 'a5fe08feb8006b9fe3ece12f52d706576c801d19' into test

Conflicts:
	dump1090.c
	mode_s.c
	public_html/style.css