new commit from VB

Conflicts:
	Default.aspx