Stand
Merge branch 'master' of github.com:mvtango/flightmap

Conflicts:
	facetview/index.html