Waypoint editing

Lots of polishing left on this feature, but time to merge to trunk
 - will likely disable "Upload" functionality on master following the merge, until further work and testing is completed