Merge branch 'tripplanner'
Merge branch 'tripplanner'
Build improvements

JShint improvements
Trip planner code cleaning
Merge branch 'master' into tripplanner