issue#2226745-6 @juliangb
Organization is sorted according to title now.
Removed dependency on email module.
Rearranged the fields and updated pm field migration helper function to support updates.

Signed-off-by: D34dMan <D34dMan@751698.no-reply.drupal.org>