Add UofM specific forms and associations.
Newline.
Merge pull request #58 from jordandukart/7.x-uofm-changes

7.x uofm changes
Merge remote-tracking branch 'origin/7.x-uofm-changes' into 7.x-UM-33

Conflicts:
	manidora.module - I blame Jordan. :V