add confirmation agreement text on order page
address update
contest update
Merge branch 'master' into stable
bring back "Black Friday" from 2013

This reverts commit 3ddc531ab2a20c582ce7efa27979cb16f1c3a5f9.

Conflicts:
	atexpc/atex_web/templates/base.html
avoid forced redirect
typos and promo updates
heads up for black friday in front page rotating banner
black friday soon on front page
updated black friday for 2014
Merge branch 'master' into stable
Merge branch 'blackfriday' into stable
turn off black friday 2014