Populated database; fixed constraints in pats_structure.sql; fixed syntax error in pats_constraints
Fixed merge conflicts