fix label position (wrong after Tom Redman merge) and add lableDisplacem...

I've fixed label position (wrong after Tom Redman merge) and add labelDisplacement property.
![diff](https://f.cloud.github.com/assets/6205247/2482109/c588f9fa-b0e5-11e3-96fb-b5d516680ddf.png)