Merge pull request #15 from creighton/master

fixed date regex, and content type on documents
added if stmts for obj1 merge
updated build time
Merge pull request #16 from ljwolford/testbranch

added if stmts for obj1 merge
fixed prepare statement