Detail Page of master detail
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/manager/masterdetail.view.js