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

Conflicts:
	client/app/subform/subform.controller.js

among other things...???
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor

Conflicts:
	client/app/roleChange/roleChange.controller.js
	client/app/subform/subform.controller.js