Merge branch 'RSherman_LEX'
Merge branch 'master' into jpittman
allocation: insert trays into allocation table on allocate boobies!!!