merge from filter-collection
merge with the local
bug fix: catalog filter
bug fix: catalog filter
Merge branch 'action-catalog' into design-feb2013
Merge branch 'design-feb2013' of https://github.com/shurigo/snq into design-feb2013