philips banner
lenovo logo
all brand logos are links to product lists
subscribe to mailchimp now working
max cache key length is 247
changed mailchimp list id
promo update, ipad mini
added back .gitignore
promotion updates
configure dev email sending to gmail
https://github.com/brutasse/django-password-reset
delegate password reset to django-password-reset
class based views reset password with templates mixins
show reset password error
reset password styling and translation
Merge branch 'reset_cbv'
link to terms and conditions on signup page
Merge branch 'stable'

Conflicts:
	.gitignore
	atexpc/atex_web/static/css/style.css
	atexpc/atex_web/static/script/all.js
	atexpc/atex_web/templates/base.html
open terms in new window