First changes
in progress
Change file format of disk archive for user defined station names from text to json.
Merge branch 'master' into Station_names_to_json

Conflicts:
	gv.py
	templates/base.html
	templates/home.html
	templates/runonce.html
	templates/stations.html
	webpages.py
Remove duplicate function definition.
Merge branch 'Station_names_to_json' into move_options

Conflicts:
	templates/options.html