# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1441914765 14400
# Node ID e7ff0f60fef8cd3ea47810dc4e09fd52738fae4b
# Parent  c6d4ea05a2d0493f33d270b78465ef5891954254# Parent  3d0321abb564b1172bfeec47d1995d898c3bef8f
merged new developments (indicator and trajectory clustering)