fix label position (wrong after Tom Redman merge) and add lableDisplacement property
Merged fix label position
merged fix label position