Critical fix to the previous commit which broke the URDF model.
Merge branch 'master' into feature/timeline
Added support for dropping .traj files onto page, and loading by pasting file contents.
Merge branch 'feature/trajectory_playback' into feature/timeline