Misc Updates
Merge remote-tracking branch 'origin/master'

Conflicts:
	checkout_process.php
Design Updates