Renaming Linear Trajectories to Trajectories and Angular Trajectories to Angles

Conflicts:
	src/model/trajectorycalcjob.cpp
	src/view/cvmobmainwindow.cpp
	src/view/videoview.cpp
	src/view/videoview.hpp