Made modals apppear in correct orders, changed something in seed, changed something in modal so that upon closing a function will occur, did a few other minor changes
Merge remote-tracking branch 'origin/master'
Made modals apppear in correct orders, changed something in seed, changed something in modal so that upon closing a function will occur, did a few other minor changes
Merge remote-tracking branch 'origin/master'

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