ie explorer  bug fixed
Merge remote-tracking branch 'upstream'

Conflicts:
	MasterPage.master