Merge remote-tracking branch 'origin/master'

Conflicts:
	Capstone2/Categories.aspx
	Capstone2/Orders.aspx
	Capstone2/Registration.aspx
	Capstone2/Users.aspx

test