updated catalog/portfolio routing
Merge branch 'dev'