Fixing resetMap()-bug.
Merge pull request #6 from terribl/master

resetMap()

Did I manage to do this right? Let's try.
Merge remote-tracking branch 'upstream/master'
Added global settings and untrackedDeveloperSettings.js-file.

untrackedDeveloperSettings.js
Create file and add line `var developerSettings = true;` on top of it.
After that some settings can be overwritten with deleloper's flavour.

-- Example File w/o line numbers --
var developerSettings = true;

var CONST_CENTERLAT = 60.0; // 45.0
var CONST_CENTERLON = 20.0; // 9.0
var CONST_ZOOMLVL   = 6; //5
-- End of Example File --

	modified:   .gitignore
	modified:   public_html/gmap.html
	modified:   public_html/script.js
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/terribl/dump1090
Merge pull request #8 from MalcolmRobb/master

Pulling in from MalcomRobb's Master
Removed 0000 squawks from table
Merge pull request #9 from MalcolmRobb/master

Pulling in from MalcomRobb's master updates
Merge remote-tracking branch 'upstream/master'
Merge branch 'mapRefactor' into masterMerge

Conflicts:
	.gitignore
	public_html/gmap.html
	public_html/script.js

  All conflicts fixed but you are still merging.

	modified:   .gitignore
	modified:   dump1090.c
	new file:   public_html/config.js
	new file:   public_html/coolclock/coolclock.js
	new file:   public_html/coolclock/excanvas.js
	new file:   public_html/coolclock/moreskins.js
	new file:   public_html/extension.js
	modified:   public_html/gmap.html
	new file:   public_html/options.js
	new file:   public_html/planeObject.js
	modified:   public_html/script.js
	modified:   public_html/style.css
Merge mapRefactor -> master
Merge mapRefactor -> master
Merge pull request #8 from bdavenport/master

I can't pretend that I understand what you guys are up to with all this Java stuff, but since the changes to the maon dump1090.c file are minimal I'll trust you :-)
Merge remote-tracking branch 'upstream/master' into mapRefactorSettings