Feature/team member custom post

Merging support for Team Member custom post types