Allow merges from parents to children

Discovered you could do this in github cause one of our people were apparently using it all the time... Turned out to not be too terribly difficult


Conflicts:
	app/views/projects/merge_requests/_form.html.haml
	features/project/forked_merge_requests.feature