New path to trails: trails/trail_id
Merge branch 'master' of https://github.com/rlfriedm/HAP-APP