A few Cookie Bugs to try to resovle. Mostly after checkout, not clearing.

Database changed for use on server.
Merge remote-tracking branch 'origin/master'

Conflicts:
	checkout.php~
	process.php
	process.php~