Event Marketing Cloning
Update Discount Code Navigation and Headers
Event Notification updates and event defaults
Merge branch 'proimage-v2.1' of github.com:ecloud/proimage

Conflicts:
	scripts/cart/send_lab.php