merge design-feb2013
Merge branch 'design-feb2013'
WIP: design, cleanup
WIP: collection filter
filter by brand, price
filter by price or new price
filter by brand, price
merge filter-collection -> design-feb2013