UITextAlignment is deprecated in favor of NSTextAlignment
Merge branch 'refs/heads/nstextalignment' into texties

* refs/heads/nstextalignment:
  UITextAlignment is deprecated in favor of NSTextAlignment