breadcrumbs
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/scripts/controllers/breadcrumbsController.js
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/categories_controller.rb