Minor changes to sublist
Merge branch 'master' of https://github.com/joethe/UMM3601ursamajor
Minor changes to sublist x2
Merge branch 'master' of https://github.com/joethe/UMM3601ursamajor
sublist updated further
Merge remote-tracking branch 'origin/master'

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