 Committer: Sam Boyarsky <boyarskys> 	modified:   db_design.xml fix stupid BS committed unresolved conflicts
 Committer: Sam Boyarsky <boyarskys>
	modified:   db_design.xml
fix stupid BS committed unresolved conflicts

NCSSM-CS/CSAssess,NCSSM-CS/CSAssess,NCSSM-CS/CSAssess,NCSSM-CS/CSAssess