fixed about
Merge branch 'kellen'

Conflicts:
	About.aspx