Working on CCing adviser option
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor

Conflicts:
	client/components/sublist/sublist.controller.js
Fixed tests, whoops.