Conflicts commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	mvc_odata/view/Detail.view.xml