+ integrated more classes
+ modifed reference tables to work with the merged data containers
Authored by: bworrell 2010-03-30
Parent: [r728]
Child: [r730]