Add map

Signed-off-by: Paul Brook <paul@nowt.org>
Merge remote-tracking branch 'origin/master' into pbrook-map

Conflicts:
	interface/index.html
Merge branch 'pbrook-map'