Merge Fixes for Issue #133

Pulled organ from device to display as read only field in Organ Models change page instead of using the foreign key to organ in cell samples twice.