Refactor in catalog.coffee
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/models/service/catalog.coffee