Merge pull request #115 from californiavol/master

Merge from master
working on department forms
Merge pull request #118 from californiavol/imac-work

Imac work