fix .gitignore file
bdavenports .diff-file
Some map view changes

	modified:   public_html/gmap.html
	modified:   public_html/script.js
	modified:   public_html/style.css
Merge remote-tracking branch 'upstream/master'
Added flags to json for valid position and heading
As MalcolmRobb suggested.

	modified:   dump1090.c
	modified:   public_html/script.js
Really minor tweaks
Upstream merge conflicts resolved
Upstream merge finalized
Web view JavaScript modifications.

	modified:   public_html/gmap.html
	modified:   public_html/script.js
	modified:   public_html/style.css
Merge remote-tracking branch 'upstream/master'
Combined effort and code from bdavenport and me.

Added quite a lot of new things this time - see modified files or just
be brave and try :)

	modified:   public_html/gmap.html
	modified:   public_html/script.js
	modified:   public_html/style.css
Few bugs
Merge pull request #3 from terribl/master

Web client
Version update

Version update for terribl and bdavenport's combined changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public_html/script.js
Merge branch 'master' into enhance-5

Conflicts:
	public_html/script.js