PM organization migration to Field API based approach.

Signed-off-by: D34dMan <D34dMan@751698.no-reply.drupal.org>
Merge branch 'feature/pmperson' of git.drupal.org:project/pm into feature/pmperson