updated version
Merge pull request #75 from lynnaloo/master

updated version
combining orm models to fix build order fumbles.
Merge remote-tracking branch 'XTUPLE-EXTENSIONS/master'