fixed bug: 'nil cart'
merge files 4 august
redesign catalog v1
Merge favorite and new catalog
Undefined method favorite