document `conflicts_with`

Only a stub now, but defined into DSL 1.0
Update blender to 2.72a
Merge pull request #6736 from rolandwalker/doc_conflicts_with

document `conflicts_with`
Merge pull request #6759 from ndr-qef/blender

Update blender to 2.72a