Merged all DB schema and bootstrap data changes prior to first public beta