add category_id on product before saving to db
return 404 for product with hidden category
newsletter images
promo updates
change stock info color
better stock colors
promo updates
newsletter resources
add category "Conectica"
google analytics
newsletter images
remove main category link
meta description and keywords
allow subcategories in menu to spread in more then one column
newsletter images without spaces in name
bigger footer
promo updates
Merge branch 'master' into stable

Conflicts:
	atexpc/atex_web/static/css/style.css
	atexpc/atex_web/templates/base_2col.html
	atexpc/atex_web/templates/search.html
order specs by id and avoid missing spec group error
load client details from Ancora