UPD: fixing url-rules
UPD: change Catalog module for #1225
Merge branch 'master' of github.com:yupe/yupe