Merge pull request #44 from chrissnyder2337/chris-dev

Chris dev
Merge pull request #45 from chrissnyder2337/chris-dev

Chris dev
Merge pull request #46 from chrissnyder2337/chris-dev

fix some issues with tika not being able to parse
Merge pull request #47 from chrissnyder2337/chris-dev

Prevent the adding of 404 pages
add anotated name to metadata attributes, fix parser
Merge pull request #48 from chrissnyder2337/chris-dev

Add ability to upload multiple files
Merge pull request #49 from chrissnyder2337/jondevelop

add anotated name to metadata attributes, fix parser
Merge pull request #50 from chrissnyder2337/chris-dev

Add keyword page
Merge pull request #51 from chrissnyder2337/chris-dev

Add Query Metadata Page
Merge pull request #52 from chrissnyder2337/chris-dev

Chris dev
Merge pull request #53 from chrissnyder2337/chris-dev

Chris dev
mychanges
Merge branch 'master' of https://github.com/chrissnyder2337/mmda into jondevelop
Merge pull request #54 from chrissnyder2337/jondevelop

mychanges
Merge branch 'master' of https://github.com/chrissnyder2337/mmda into jondevelop
test
restore before mychanges
Merge pull request #55 from chrissnyder2337/jondevelop

Jondevelop
Allow db attributes to be NULL