terminate sql command
add invalid offer state
add totalselling field for activeoffers
add amount purchased to Offeraccepted table
resolve conflicts
Update omni_db_schema.psql
db schema update
Merge branch 'marv' into Marv
Merge pull request #5 from achamely/Marv

update definitions