Some waypoint-map updates
Integration with tower code
Working waypoint system now aligned to map
Merge pull request #22 from sli-fox/steph_branch

Steph branch
fix conflit and merged the new master file