changes in parent_profile api controller
fix merge conflicts
removed etra files