repository sets - show action
Merge pull request #3723 from komidore64/repo-set-info

repository sets - show action
Change to add extra sass paths to the sass config instead of the assets config.
Merge pull request #3742 from ehelms/fixing-scss-pathing

Change to add extra sass paths to the sass config instead of the assets ...
Merge remote-tracking branch 'upstream/master' into cv-wat

Conflicts:
	config/routes/api/v2.rb
Fixing broken tests by reloading models and fixing relationships
Merge pull request #3746 from daviddavis/cv-wat

Merge master into cv-rework