update2
Merge remote-tracking branch 'origin/master'

Conflicts:
	About.aspx
	Collections.aspx
	Default.aspx