Wired up the en-route map and actual beacon metadata screens
Merge branch 'master' into anu
Fixed warning