Clustering Order
Merge branch 'Clustering_Order' by Julien Sebrien into WIP. Add some minor cosmetic changes
temp
wip2
wip3