Figure 1 caption modified
Merge branch 'master' of https://github.com/claudiaesteves/MIG2014-Trajectories

Conflicts:
	sec-overview.tex