made some progress on the form, still having issues with labels and stuff.
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/subform/subform.css