add auto placing label for distance between two points
Merge branch 'bugs' into OpenMAF-2-2