Beacon.java, not in the correct place
Merge branch 'master' of https://github.com/cdelorme/collision-avoidance-warning