Add initial and final points to trajectory and currents plot.
Merge branch 'develop'