Merge Equipment feature branch into Master

I have implemented all the changes discussed and decided on at our Feb. 26-27 meeting.  
See our meeting notes at https://docs.google.com/a/stroudcenter.org/document/d/1P0y-NNNiKQ170dUkHmU2XUrHku2rVB9CNhFR3YVf6R8/edit#bookmark=id.u2ljnzqdnrob
See our draft diagram of these changes here: http://uchic.github.io/ODM2/schemas/ODM2_Feb26_MeetingBranch/diagrams/ODM2Equipment.html