Spruce up map selection screen.
Add 4 more beacons to test map.
Merge master.
Merge remote-tracking branch 'origin/master' into jp-post-position