Fixed some glitches.
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor

Conflicts:
	client/components/sublist/sublist.html
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor