When cloning a pft add a link back to parent (RM-1245)
Merge branch 'master' into RM-1245-add-parent-to-pft

Conflicts:
	db/schema.rb